X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FViewOrgPage.java;h=c8259412ae4dca1452d0b33189079ce859203d5b;hb=8c9012b3054bc5785c68ca17e1372e88a9120c70;hp=815a2cebeb4fb7bc325293d2601b30326776e165;hpb=7f0229055197cf353db26e61b1f5d84ddf5b58df;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
index 815a2ceb..c8259412 100644
--- a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
+++ b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
@@ -18,6 +18,7 @@ import org.cacert.gigi.output.template.IterableDataset;
 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 {
@@ -47,17 +48,25 @@ public class ViewOrgPage extends Page {
                     resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
                 }
                 return;
-            } else if (req.getParameter("addDomain") != null) {
-                if (Form.getForm(req, OrgDomainAddForm.class).submit(resp.getWriter(), req)) {
-                    // resp.sendRedirect(DEFAULT_PATH + "/" +
-                    // form.getOrganisation().getId());
-                }
             } else {
                 if ( !u.isInGroup(CreateOrgPage.ORG_ASSURER)) {
                     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 {
+                    Form.getForm(req, CreateOrgForm.class).submit(resp.getWriter(), req);
+                }
             }
 
         } catch (GigiApiException e) {
@@ -103,6 +112,7 @@ public class ViewOrgPage extends Page {
         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));