}
@Override
- public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
+ public boolean submit(HttpServletRequest req) throws GigiApiException {
if (req.getParameter("del") != null) {
User toRemove = User.getByEmail(req.getParameter("del"));
if (toRemove != null) {
o.removeAdmin(toRemove, LoginPage.getUser(req));
+ return true;
}
- }
- if (req.getParameter("do_affiliate") != null) {
+ } else if (req.getParameter("do_affiliate") != null) {
User byEmail = User.getByEmail(req.getParameter("email"));
- if (byEmail != null) {
+ if (byEmail != null && byEmail.canAssure()) {
o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
+ return true;
+ } else {
+ throw new GigiApiException("Requested user is not a RA Agent. We need a RA Agent here.");
}
}
- return true;
+ throw new GigiApiException("No action could have been carried out.");
}
@Override
@Override
public boolean next(Language l, Map<String, Object> vars) {
- if ( !iter.hasNext())
+ if ( !iter.hasNext()) {
return false;
+ }
Affiliation aff = iter.next();
- vars.put("name", aff.getTarget().getName());
- vars.put("master", aff.isMaster() ? l.getTranslation("master") : "");
+ vars.put("name", aff.getTarget().getPreferredName());
+ vars.put("master", aff.isMaster() ? l.getTranslation("Master") : "");
vars.put("e-mail", aff.getTarget().getEmail());
return true;
}