UPD: cleanup org-form-page, make the form look different when editing.

[gigi.git] / src / org / cacert / gigi / pages / orga / AffiliationForm.java

diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.java b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
index defd3baf7755b0ada176249e2f49ee6d44c1de5b..a74bf50f8533b13a84cddbe365ffabb034cb3604 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/AffiliationForm.java
+++ b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
@@ -30,14 +30,17 @@ public class AffiliationForm extends Form {
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
-        User toRemove = User.getByEmail(req.getParameter("del"));
-        if (toRemove != null) {
-            o.removeAdmin(toRemove, LoginPage.getUser(req));
+        if (req.getParameter("del") != null) {
+            User toRemove = User.getByEmail(req.getParameter("del"));
+            if (toRemove != null) {
+                o.removeAdmin(toRemove, LoginPage.getUser(req));
+            }
         }
-
-        User byEmail = User.getByEmail(req.getParameter("email"));
-        if (byEmail != null) {
-            o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
+        if (req.getParameter("do_affiliate") != null) {
+            User byEmail = User.getByEmail(req.getParameter("email"));
+            if (byEmail != null) {
+                o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
+            }
         }
         return true;
     }