add: revocation state in the result list of support cert search

[gigi.git] / src / club / wpia / gigi / pages / admin / support / SupportUserDetailsForm.java

diff --git a/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java
index a7b1be77b4fbe9332cc834eab9b12ab8ba449d56..969cbe62fee6d1df01b09f37ec3eff885f48274a 100644 (file)
--- a/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java
+++ b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java
@@ -14,7 +14,7 @@ import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.output.ArrayIterable;
 import club.wpia.gigi.output.DateSelector;
-import club.wpia.gigi.output.GroupIterator;
+import club.wpia.gigi.output.GroupList;
 import club.wpia.gigi.output.GroupSelector;
 import club.wpia.gigi.output.template.Form;
 import club.wpia.gigi.output.template.Template;
@@ -84,6 +84,7 @@ public class SupportUserDetailsForm extends Form {
             @Override
             public void apply(Name t, Language l, Map<String, Object> vars) {
                 vars.put("name", t);
+                vars.put("preferred", t.getOwner().getPreferredName() == t);
                 vars.put("points", Integer.toString(t.getVerificationPoints()));
             }
 
@@ -93,8 +94,8 @@ public class SupportUserDetailsForm extends Form {
         vars.put("verificationPoints", user.getVerificationPoints());
         vars.put("exppoints", user.getExperiencePoints());
         final Set<Group> gr = user.getGroups();
-        vars.put("support-groups", new GroupIterator(gr.iterator(), true));
-        vars.put("groups", new GroupIterator(gr.iterator(), false));
+        vars.put("support-groups", new GroupList(gr, true));
+        vars.put("groups", new GroupList(gr, false));
         vars.put("groupSelector", value);
         t.output(out, l, vars);
     }