X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FAffiliationForm.java;h=defd3baf7755b0ada176249e2f49ee6d44c1de5b;hb=5296e49740e5bb1c963889a285f561f03dbb4547;hp=e9ab64b4a56f631be54925c39b5e5514ba88875a;hpb=d4802b68c651a984f0b98a462ac1e7721aa50388;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.java b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
index e9ab64b4..defd3baf 100644
--- a/src/org/cacert/gigi/pages/orga/AffiliationForm.java
+++ b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
@@ -12,7 +12,7 @@ import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.dbObjects.Organisation.Affiliation;
 import org.cacert.gigi.dbObjects.User;
 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.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
@@ -30,7 +30,15 @@ public class AffiliationForm extends Form {
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
-        o.addAdmin(User.getByEmail(req.getParameter("email")), LoginPage.getUser(req), req.getParameter("master") != 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);
+        }
         return true;
     }
 
@@ -48,6 +56,7 @@ public class AffiliationForm extends Form {
                 Affiliation aff = iter.next();
                 vars.put("name", aff.getTarget().getName());
                 vars.put("master", aff.isMaster() ? l.getTranslation("master") : "");
+                vars.put("e-mail", aff.getTarget().getEmail());
                 return true;
             }
         });