package org.cacert.gigi.pages.admin.support;
import java.io.PrintWriter;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
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;
private DateSelector dobSelector;
- private GroupSelector value = new GroupSelector("groupToModify");
+ private GroupSelector value = new GroupSelector("groupToModify", true);
public SupportUserDetailsForm(HttpServletRequest hsr, SupportedUser user) {
super(hsr);
if (user.getTicket() == null) {
return false;
}
- if ((req.getParameter("detailupdate") != null ? 1 : 0) + (req.getParameter("grant") != null ? 1 : 0) + (req.getParameter("deny") != null ? 1 : 0) + (req.getParameter("resetPass") != null ? 1 : 0) != 1) {
+ if ((req.getParameter("detailupdate") != null ? 1 : 0) + (req.getParameter("addGroup") != null ? 1 : 0) + (req.getParameter("removeGroup") != null ? 1 : 0) + (req.getParameter("resetPass") != null ? 1 : 0) != 1) {
throw new GigiApiException("More than one action requested!");
}
- if (req.getParameter("grant") != null || req.getParameter("deny") != null) {
+ if (req.getParameter("addGroup") != null || req.getParameter("removeGroup") != null) {
String actionType = "granted";
value.update(req);
Group toMod = value.getGroup();
- if (req.getParameter("grant") != null) {
+ if (req.getParameter("addGroup") != null) {
user.grant(toMod);
} else {
actionType = "revoked";
vars.put("dob", dobSelector);
vars.put("assurancepoints", user.getAssurancePoints());
vars.put("exppoints", user.getExperiencePoints());
- vars.put("id", user.getId());
final Set<Group> gr = user.getGroups();
- vars.put("groups", new IterableDataset() {
-
- Iterator<Group> i = gr.iterator();
-
- @Override
- public boolean next(Language l, Map<String, Object> 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);
}