fix: correct editable/non-editable DoB display in My Details

[gigi.git] / src / org / cacert / gigi / pages / account / mail / MailOverview.java

diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.java b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
index e3b59916403ccbb64a933af0c3964acc6442aed0..b828b7189d7e6fcc8b10bd966cce9cbf7023003f 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
@@ -36,10 +37,14 @@ public class MailOverview extends Page {
         PrintWriter out = resp.getWriter();
         if (req.getParameter("addmail") != null) {
             MailAddForm f = Form.getForm(req, MailAddForm.class);
-            if (f.submit(out, req)) {
-                resp.sendRedirect(MailOverview.DEFAULT_PATH);
+            try {
+                if (f.submit(out, req)) {
+                    resp.sendRedirect(MailOverview.DEFAULT_PATH);
+                }
+            } catch (GigiApiException e) {
+                e.format(resp.getWriter(), getLanguage(req));
             }
-        } else if (req.getParameter("makedefault") != null || req.getParameter("delete") != null) {
+        } else {
             MailManagementForm f = Form.getForm(req, MailManagementForm.class);
             if (f.submit(out, req)) {
                 resp.sendRedirect(MailOverview.DEFAULT_PATH);