X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2Fsupport%2FSupportUserDetailsForm.java;fp=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2Fsupport%2FSupportUserDetailsForm.java;h=28597ca2f8bcc9f25b9bb227f05895ae23ab66dc;hp=df7840587fe94ba6daa228b6a3d99296434ec576;hb=a995a3619a629d010f2ab8ebd053f44547b3ff3b;hpb=d46bd087fcf633dc2bccecbce63108011da33871 diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java index df784058..28597ca2 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java +++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java @@ -1,7 +1,6 @@ package org.cacert.gigi.pages.admin.support; import java.io.PrintWriter; -import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -15,9 +14,9 @@ import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.ArrayIterable; import org.cacert.gigi.output.DateSelector; +import org.cacert.gigi.output.GroupIterator; import org.cacert.gigi.output.GroupSelector; import org.cacert.gigi.output.template.Form; -import org.cacert.gigi.output.template.IterableDataset; import org.cacert.gigi.output.template.Outputable; import org.cacert.gigi.output.template.SprintfCommand; import org.cacert.gigi.output.template.Template; @@ -107,20 +106,8 @@ public class SupportUserDetailsForm extends Form { vars.put("assurancepoints", user.getAssurancePoints()); vars.put("exppoints", user.getExperiencePoints()); final Set gr = user.getGroups(); - vars.put("groups", new IterableDataset() { - - Iterator i = gr.iterator(); - - @Override - public boolean next(Language l, Map vars) { - if ( !i.hasNext()) { - return false; - } - Group g = i.next(); - vars.put("group_name", g.getName()); - return true; - } - }); + vars.put("support-groups", new GroupIterator(gr.iterator(), true)); + vars.put("groups", new GroupIterator(gr.iterator(), false)); vars.put("groupSelector", value); t.output(out, l, vars); }