upd: get default variables into outputables for error messages

[gigi.git] / src / club / wpia / gigi / pages / account / domain / DomainOverview.java

diff --git a/src/club/wpia/gigi/pages/account/domain/DomainOverview.java b/src/club/wpia/gigi/pages/account/domain/DomainOverview.java
index 4db4865c882db62425708eaf70d1873152bf701c..b3c60da6ad531671dd1c832c95756e5a197acde3 100644 (file)
--- a/src/club/wpia/gigi/pages/account/domain/DomainOverview.java
+++ b/src/club/wpia/gigi/pages/account/domain/DomainOverview.java
@@ -1,7 +1,7 @@
 package club.wpia.gigi.pages.account.domain;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -27,7 +27,7 @@ public class DomainOverview extends ManagedMultiFormPage {
         CertificateOwner u = LoginPage.getAuthorizationContext(req).getTarget();
         try {
             DomainManagementForm domMan = new DomainManagementForm(req, u, false);
-            HashMap<String, Object> vars = new HashMap<>();
+            Map<String, Object> vars = getDefaultVars(req);
             vars.put("domainman", domMan);
             if (u instanceof User) {
                 DomainAddForm domAdd = new DomainAddForm(req, (User) u);
@@ -35,7 +35,7 @@ public class DomainOverview extends ManagedMultiFormPage {
             }
             getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
         } catch (GigiApiException e) {
-            e.format(resp.getWriter(), getLanguage(req));
+            e.format(resp.getWriter(), getLanguage(req), getDefaultVars(req));
         }
     }
 
@@ -46,6 +46,6 @@ public class DomainOverview extends ManagedMultiFormPage {
         } else if (req.getParameter("delete") != null) {
             return Form.getForm(req, DomainManagementForm.class);
         }
-        return null;
+        throw new CSRFException();
     }
 }