upd: enforce a more strict Form call pattern.

[gigi.git] / src / org / cacert / gigi / pages / account / domain / DomainManagementForm.java

diff --git a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java
index 4e80123af307fcba1ae4d99b579f5a61c5b9bc08..c6ea009f1d3dc669c8edfcfc8ed3fca1e9060bca 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java
@@ -12,7 +12,7 @@ import org.cacert.gigi.localisation.Language;
 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.Page;
+import org.cacert.gigi.pages.orga.ViewOrgPage;
 
 public class DomainManagementForm extends Form {
 
@@ -29,26 +29,21 @@ public class DomainManagementForm extends Form {
     }
 
     @Override
-    public boolean submit(PrintWriter out, HttpServletRequest req) {
-        try {
-            String dels = req.getParameter("delete");
+    public SubmissionResult submit(HttpServletRequest req) throws GigiApiException {
+        String dels = req.getParameter("delete");
 
-            int delId = Integer.parseInt(dels);
-            Domain d = Domain.getById(delId);
-            if (d != null && d.getOwner() == target) {
-                d.delete();
-            } else {
-                throw new GigiApiException("Domain was not found.");
-            }
-        } catch (GigiApiException e) {
-            e.format(out, Page.getLanguage(req));
-            return false;
+        int delId = Integer.parseInt(dels);
+        Domain d = Domain.getById(delId);
+        if (d != null && d.getOwner() == target) {
+            d.delete();
+        } else {
+            throw new GigiApiException("Domain was not found.");
+        }
+        if (foreign) {
+            return new RedirectResult(ViewOrgPage.DEFAULT_PATH + "/" + target.getId());
+        } else {
+            return new RedirectResult(DomainOverview.PATH);
         }
-        return true;
-    }
-
-    public CertificateOwner getTarget() {
-        return target;
     }
 
     @Override
@@ -66,7 +61,7 @@ public class DomainManagementForm extends Form {
                 Domain domain = doms[point];
                 vars.put("id", domain.getId());
                 if ( !foreign) {
-                    vars.put("domainhref", DomainOverview.PATH + domain.getId());
+                    vars.put("domainhref", DomainOverview.PATH + "/" + domain.getId());
                 }
                 vars.put("domain", domain.getSuffix());
                 vars.put("status", l.getTranslation(domain.isVerified() ? "verified" : "not verified"));