X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMyDetails.java;h=bf80d47beaf53fb1197a5f169944342ab04fbe44;hb=fab3ca9955f6fb5248e828bc7ca0ca919375f7c3;hp=9f9a344c42c311a9fbcc0a6f1a69a418be4bbf71;hpb=7d143b2edcb0ea7bfe149fd6b77b35ffcf94acf5;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/MyDetails.java b/src/org/cacert/gigi/pages/account/MyDetails.java
index 9f9a344c..bf80d47b 100644
--- 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,30 @@ 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("action") != null || req.getParameter("removeName") != null || req.getParameter("deprecateName") != null || req.getParameter("preferred") != null) {
+            if (Form.getForm(req, MyDetailsForm.class).submit(resp.getWriter(), req)) {
+                resp.sendRedirect(PATH);
+            }
         }
         super.doPost(req, resp);
     }