import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.pages.account.domain.DomainManagementForm;
+import org.cacert.gigi.util.AuthorizationContext;
public class ViewOrgPage extends Page {
}
@Override
- public boolean isPermitted(User u) {
- return u != null && (u.isInGroup(CreateOrgPage.ORG_ASSURER) || u.getOrganisations().size() != 0);
+ public boolean isPermitted(AuthorizationContext ac) {
+ return ac != null && (ac.isInGroup(CreateOrgPage.ORG_ASSURER) || ac.getActor().getOrganisations(true).size() != 0);
}
@Override
resp.sendError(403, "Access denied");
return;
}
- Form.getForm(req, CreateOrgForm.class).submit(resp.getWriter(), req);
+
+ if (req.getParameter("addDomain") != null) {
+ OrgDomainAddForm form = Form.getForm(req, OrgDomainAddForm.class);
+ if (form.submit(resp.getWriter(), req)) {
+ resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
+ }
+ } else if (req.getParameter("delete") != null) {
+ DomainManagementForm form = Form.getForm(req, DomainManagementForm.class);
+ if (form.submit(resp.getWriter(), req)) {
+ resp.sendRedirect(DEFAULT_PATH + "/" + form.getTarget().getId());
+ }
+ } else {
+ CreateOrgForm form = Form.getForm(req, CreateOrgForm.class);
+ if (form.submit(resp.getWriter(), req)) {
+ resp.sendRedirect(DEFAULT_PATH + "/" + form.getResult().getId());
+ }
+ }
}
} catch (GigiApiException e) {
if (idS.length() < DEFAULT_PATH.length() + 2) {
final Organisation[] orgas = Organisation.getOrganisations(0, 30);
HashMap<String, Object> map = new HashMap<>();
- final List<Organisation> myOrgs = u.getOrganisations();
+ final List<Organisation> myOrgs = u.getOrganisations(true);
final boolean orgAss = u.isInGroup(CreateOrgPage.ORG_ASSURER);
if (orgAss) {
map.put("orgas", makeOrgDataset(orgas));
}
idS = idS.substring(DEFAULT_PATH.length() + 1);
int id = Integer.parseInt(idS);
- Organisation o = Organisation.getById(id);
+ Organisation o;
+ try {
+ o = Organisation.getById(id);
+ } catch (IllegalArgumentException e) {
+ resp.sendError(404);
+ return;
+ }
final List<Organisation> myOrgs = u.getOrganisations();
final boolean orgAss = u.isInGroup(CreateOrgPage.ORG_ASSURER);
- if (o == null || ( !orgAss && !myOrgs.contains(o))) {
+ if ( !orgAss && !myOrgs.contains(o)) {
resp.sendError(404);
return;
}
HashMap<String, Object> vars = new HashMap<>();
- vars.put("editForm", new CreateOrgForm(req, o));
- vars.put("affForm", new AffiliationForm(req, o));
+ if (orgAss) {
+ vars.put("editForm", new CreateOrgForm(req, o));
+ vars.put("affForm", new AffiliationForm(req, o));
+ vars.put("mgmDom", new DomainManagementForm(req, o, true));
+ vars.put("addDom", new OrgDomainAddForm(req, o));
+ } else {
+ vars.put("affForm", new AffiliationForm(req, o));
+ vars.put("orgName", o.getName());
+ }
mainTempl.output(out, lang, vars);
}