X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Fpages%2Fadmin%2Fsupport%2FSupportUserDetailsForm.java;h=969cbe62fee6d1df01b09f37ec3eff885f48274a;hb=39f9de33cf93e893cf61a3f21a2af61c7b1eebfc;hp=a7b1be77b4fbe9332cc834eab9b12ab8ba449d56;hpb=08c941629aea14473e5c42ab6f5d590be4af4bf8;p=gigi.git diff --git a/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/club/wpia/gigi/pages/admin/support/SupportUserDetailsForm.java index a7b1be77..969cbe62 100644 --- 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 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 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); }