X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FCreateOrgForm.java;h=32a9ceb7033ebba4a602f729372714ab8c13d813;hb=214daf6a8eca8376b0ff835b6d28abaaa61a0792;hp=df5d4fe272292e7c30d0bb23bc041be9f8ba0a8d;hpb=5f0c781007ae0ddce24057654a0ab095bc2a2b5b;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
index df5d4fe2..32a9ceb7 100644
--- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 
@@ -26,17 +26,23 @@ public class CreateOrgForm extends Form {
 
     private String l = "";
 
+    private String email = "";
+
+    private boolean isEdit = false;
+
     public CreateOrgForm(HttpServletRequest hsr) {
         super(hsr);
     }
 
     public CreateOrgForm(HttpServletRequest hsr, Organisation t) {
         super(hsr);
+        isEdit = true;
         result = t;
         o = t.getName();
         c = t.getState();
         st = t.getProvince();
         l = t.getCity();
+        email = t.getContactEmail();
     }
 
     @Override
@@ -45,11 +51,12 @@ public class CreateOrgForm extends Form {
         c = req.getParameter("C");
         st = req.getParameter("ST");
         l = req.getParameter("L");
+        email = req.getParameter("contact");
         if (result != null) {
-            result.update(o, c, st, l);
+            result.update(o, c, st, l, email);
             return true;
         }
-        Organisation ne = new Organisation(o, c, st, l, LoginPage.getUser(req));
+        Organisation ne = new Organisation(o, c, st, l, email, LoginPage.getUser(req));
         result = ne;
         return true;
     }
@@ -64,6 +71,10 @@ public class CreateOrgForm extends Form {
         vars.put("C", c);
         vars.put("ST", st);
         vars.put("L", this.l);
+        vars.put("email", email);
+        if (isEdit) {
+            vars.put("edit", true);
+        }
         t.output(out, l, vars);
     }
 }