import org.cacert.gigi.dbObjects.Organisation.Affiliation;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
import org.cacert.gigi.output.template.IterableDataset;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
@Override
public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
- o.addAdmin(User.getByEmail(req.getParameter("email")), LoginPage.getUser(req), req.getParameter("master") != null);
+ User toRemove = User.getByEmail(req.getParameter("del"));
+ if (toRemove != null) {
+ o.removeAdmin(toRemove, LoginPage.getUser(req));
+ }
+
+ User byEmail = User.getByEmail(req.getParameter("email"));
+ if (byEmail != null) {
+ o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
+ }
return true;
}
Affiliation aff = iter.next();
vars.put("name", aff.getTarget().getName());
vars.put("master", aff.isMaster() ? l.getTranslation("master") : "");
+ vars.put("e-mail", aff.getTarget().getEmail());
return true;
}
});