Merge commit '0176ca7cda25ad88e9faa116ffa139ca926de273' into HEAD

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

diff --git a/src/org/cacert/gigi/pages/account/MyDetails.java b/src/org/cacert/gigi/pages/account/MyDetails.java
index 9f9a344c42c311a9fbcc0a6f1a69a418be4bbf71..4b0aa992fe6025bac5ed46c834a96fef62958acc 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetails.java
+++ b/src/org/cacert/gigi/pages/account/MyDetails.java
@@ -7,7 +7,8 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 
 public class MyDetails extends Page {
@@ -23,20 +24,28 @@ public class MyDetails extends Page {
         PrintWriter out = resp.getWriter();
         HashMap<String, Object> map = new HashMap<String, Object>();
         MyDetailsForm form = new MyDetailsForm(req, getUser(req));
-        MyListingForm listingForm = new MyListingForm(req, getUser(req));
         map.put("detailsForm", form);
-        map.put("contactMeForm", listingForm);
+        if (LoginPage.getUser(req).getOrganisations().size() != 0) {
+            map.put("orgaForm", new MyOrganisationsForm(req));
+        }
         getDefaultTemplate().output(out, getLanguage(req), map);
     }
 
+    @Override
+    public boolean beforeTemplate(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        if (req.getParameter("orgaForm") != null) {
+            Form.getForm(req, MyOrganisationsForm.class).submit(resp.getWriter(), req);
+        } else {
+            return false;
+        }
+        resp.sendRedirect(PATH);
+        return true;
+    }
+
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        if(req.getParameter("processDetails") != null) {
-            MyDetailsForm form = Form.getForm(req, MyDetailsForm.class);
-            form.submit(resp.getWriter(), req);
-        } else if (req.getParameter("processContact") != null) {
-            MyListingForm form = Form.getForm(req, MyListingForm.class);
-            form.submit(resp.getWriter(), req);
+        if (req.getParameter("processDetails") != null) {
+            Form.getForm(req, MyDetailsForm.class).submit(resp.getWriter(), req);
         }
         super.doPost(req, resp);
     }