diff options
author | Sebastian Reichel <sre@ring0.de> | 2017-06-15 14:26:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-15 14:26:59 +0200 |
commit | 77f8bd0abffb140462c83d97d55e50c7136d7959 (patch) | |
tree | ab2cddec3ad0396fe43c05a50230e677c6e477ca /src/web/web.vala | |
parent | 1643686c6260ea6e5c54f50c52bcf7e1ebb8a010 (diff) | |
parent | 54828fef6bd859234b353685dade7d6841d7dd18 (diff) | |
download | serial-barcode-scanner-77f8bd0abffb140462c83d97d55e50c7136d7959.tar.bz2 |
Merge pull request #26 from smilix/joined_at_info
adds the joined_at column and support in the db/web
Diffstat (limited to 'src/web/web.vala')
-rw-r--r-- | src/web/web.vala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/web/web.vala b/src/web/web.vala index c63db73..e60b325 100644 --- a/src/web/web.vala +++ b/src/web/web.vala @@ -214,10 +214,10 @@ public class WebServer { foreach(var member in csvimport.get_members()) { if(db.user_exists(member.id) && !db.user_equals(member)) { var dbmember = db.get_user_info(member.id); - data1 += @"<tr class=\"error\"><td><i class=\"icon-minus-sign\"></i><td>$(dbmember.id)</td><td>$(dbmember.firstname)</td><td>$(dbmember.lastname)</td><td>$(dbmember.email)</td><td>$(dbmember.gender)</td><td>$(dbmember.street)</td><td>$(dbmember.postcode)</td><td>$(dbmember.city)</td><td>$(dbmember.pgp)</td><td>$(dbmember.hidden)</td><td>$(dbmember.disabled)</td></tr>"; + data1 += @"<tr class=\"error\"><td><i class=\"icon-minus-sign\"></i><td>$(dbmember.id)</td><td>$(dbmember.firstname)</td><td>$(dbmember.lastname)</td><td>$(dbmember.email)</td><td>$(dbmember.gender)</td><td>$(dbmember.street)</td><td>$(dbmember.postcode)</td><td>$(dbmember.city)</td><td>$(dbmember.pgp)</td><td>$(dbmember.hidden)</td><td>$(dbmember.disabled)</td><td>$(dbmember.joined_at)</td></tr>"; } if(!db.user_exists(member.id) || !db.user_equals(member)) { - data1 += @"<tr class=\"success\"><td><i class=\"icon-plus-sign\"></td><td>$(member.id)</td><td>$(member.firstname)</td><td>$(member.lastname)</td><td>$(member.email)</td><td>$(member.gender)</td><td>$(member.street)</td><td>$(member.postcode)</td><td>$(member.city)</td><td>$(member.pgp)</td><td>$(member.hidden)</td><td>$(member.disabled)</td></tr>"; + data1 += @"<tr class=\"success\"><td><i class=\"icon-plus-sign\"></td><td>$(member.id)</td><td>$(member.firstname)</td><td>$(member.lastname)</td><td>$(member.email)</td><td>$(member.gender)</td><td>$(member.street)</td><td>$(member.postcode)</td><td>$(member.city)</td><td>$(member.pgp)</td><td>$(member.hidden)</td><td>$(member.disabled)</td><td>$(member.joined_at)</td></tr>"; } } t.replace("DATA1", data1); |