diff options
| author | Sebastian Reichel <sre@ring0.de> | 2016-09-17 01:09:11 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2016-09-17 01:09:11 +0200 |
| commit | bd025aaaca75253f8c4cfea4cb1353dcfb020e49 (patch) | |
| tree | 6e152e2e7090d4f9181a2c3b1ed0b41910b96b08 | |
| parent | 0f5601988c5898658c6d585349249107370e0d40 (diff) | |
| download | serial-barcode-scanner-bd025aaaca75253f8c4cfea4cb1353dcfb020e49.tar.bz2 | |
show disabled and hidden in csv diff
| -rw-r--r-- | src/web/web.vala | 4 | ||||
| -rw-r--r-- | templates/users/import.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/web/web.vala b/src/web/web.vala index 1dedeff..474d685 100644 --- a/src/web/web.vala +++ b/src/web/web.vala @@ -208,10 +208,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></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></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></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></tr>"; } } t.replace("DATA1", data1); diff --git a/templates/users/import.html b/templates/users/import.html index bdffcc4..a9d7ee3 100644 --- a/templates/users/import.html +++ b/templates/users/import.html @@ -21,7 +21,7 @@ <div style="display: {{{STEP23}}}"> <table class="table table-bordered"> <thead> - <tr><th><i class="icon-wrench"></i></th><th>ID</th><th>Firstname</th><th>Lastname</th><th>E-Mail</th><th>Gender</th><th>Street</th><th>Postcode</th><th>City</th><th>PGP</th></tr> + <tr><th><i class="icon-wrench"></i></th><th>ID</th><th>Firstname</th><th>Lastname</th><th>E-Mail</th><th>Gender</th><th>Street</th><th>Postcode</th><th>City</th><th>PGP</th><th>Hidden</th><th>Disabled</th></tr> </thead> <tbody> {{{DATA1}}} |