diff options
| author | Sebastian Reichel <sre@ring0.de> | 2016-09-17 00:45:30 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2016-09-17 01:01:01 +0200 |
| commit | 0f5601988c5898658c6d585349249107370e0d40 (patch) | |
| tree | 16d5ee6e55cf5e21548590218d39785f51afb78e /src/web | |
| parent | 347f5dc2f3c127478ac1a12709dd4e6cae76da07 (diff) | |
| download | serial-barcode-scanner-0f5601988c5898658c6d585349249107370e0d40.tar.bz2 | |
move disabled flag from auth table to user table
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/csv.vala | 4 | ||||
| -rw-r--r-- | src/web/web.vala | 3 | ||||
| -rw-r--r-- | src/web/websession.vala | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/web/csv.vala b/src/web/csv.vala index 92e7017..ecfe2c2 100644 --- a/src/web/csv.vala +++ b/src/web/csv.vala @@ -52,7 +52,7 @@ public class CSVMemberFile { public CSVMemberFile(string data) { foreach(var line in data.split("\n")) { var linedata = csv_split(line); - if(linedata.length >= 9) { + if(linedata.length >= 11) { var m = UserInfo(); m.id = int.parse(csv_value(linedata[0])); m.email = csv_value(linedata[1]); @@ -63,6 +63,8 @@ public class CSVMemberFile { m.city = csv_value(linedata[6]); m.gender = csv_value(linedata[7]) == "m" ? "masculinum" : csv_value(linedata[7]) == "w" ? "femininum" : "unknown"; m.pgp = csv_value(linedata[8]); + m.hidden = int.parse(csv_value(linedata[9])) != 0; + m.disabled = int.parse(csv_value(linedata[10])) != 0; if(csv_value(linedata[0]) != "EXTERNEMITGLIEDSNUMMER") members += m; } diff --git a/src/web/web.vala b/src/web/web.vala index ee6e71a..1dedeff 100644 --- a/src/web/web.vala +++ b/src/web/web.vala @@ -333,9 +333,10 @@ public class WebServer { t.replace("POSTALCODE", userinfo.postcode); t.replace("CITY", userinfo.city); t.replace("PGPKEYID", userinfo.pgp); + t.replace("DISABLED", userinfo.disabled ? "true" : "false"); + t.replace("HIDDEN", userinfo.hidden ? "true" : "false"); var userauth = db.get_user_auth(id); - t.replace("DISABLED", userauth.disabled ? "true" : "false"); t.replace("ISSUPERUSER", userauth.superuser ? "true" : "false"); t.replace("HAS_AUTH_PRODUCTS", userauth.auth_products ? "Yes" : "No"); t.replace("HAS_AUTH_CASHBOX", userauth.auth_cashbox ? "Yes" : "No"); diff --git a/src/web/websession.vala b/src/web/websession.vala index 1b2e223..ae3cafc 100644 --- a/src/web/websession.vala +++ b/src/web/websession.vala @@ -84,7 +84,7 @@ public class WebSession { private void setup_auth(int user) throws DatabaseError, IOError { var auth = db.get_user_auth(user); - this.disabled = auth.disabled; + this.disabled = db.user_is_disabled(user); this.superuser = auth.superuser; this.auth_cashbox = auth.auth_cashbox; this.auth_products = auth.auth_products; |