import javax.servlet.http.HttpServletRequest;
import club.wpia.gigi.GigiApiException;
+import club.wpia.gigi.dbObjects.Name;
import club.wpia.gigi.dbObjects.Organisation;
-import club.wpia.gigi.dbObjects.User;
import club.wpia.gigi.dbObjects.Organisation.Affiliation;
+import club.wpia.gigi.dbObjects.User;
import club.wpia.gigi.localisation.Language;
import club.wpia.gigi.output.template.Form;
import club.wpia.gigi.output.template.IterableDataset;
}
} else if (req.getParameter("do_affiliate") != null) {
User byEmail = User.getByEmail(req.getParameter("email"));
- if (byEmail != null && byEmail.canVerify()) {
+ if (byEmail == null) {
+ throw new GigiApiException("To add an admin, the email address needs to be known to the system.");
+ }
+ if (byEmail.canVerify()) {
o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
return new RedirectResult(ViewOrgPage.DEFAULT_PATH + "/" + o.getId());
} else {
return false;
}
Affiliation aff = iter.next();
- vars.put("name", aff.getTarget().getPreferredName());
+ Name n = aff.getTarget().getPreferredName();
+ vars.put("name", n);
+ vars.put("nameString", n.toString());
vars.put("master", aff.isMaster() ? l.getTranslation("Master") : "");
vars.put("e-mail", aff.getTarget().getEmail());
return true;