X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FAffiliationForm.java;h=42682fedcf949371ac1e83e5b7ca5bdae05eadc4;hp=b9a42e7acbfc368d7badc2ca593678e18f42fbcc;hb=abff88a2bf173198fe55c35ead97c9c7cdb5924c;hpb=6e68a37137bfb773a9eae63fb756e881644fafae

diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.java b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
index b9a42e7a..42682fed 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;
@@ -29,17 +29,23 @@ 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));
-        }
-
-        User byEmail = User.getByEmail(req.getParameter("email"));
-        if (byEmail != null) {
-            o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
+    public SubmissionResult submit(HttpServletRequest req) throws GigiApiException {
+        if (req.getParameter("del") != null) {
+            User toRemove = User.getByEmail(req.getParameter("del"));
+            if (toRemove != null) {
+                o.removeAdmin(toRemove, LoginPage.getUser(req));
+                return new RedirectResult(ViewOrgPage.DEFAULT_PATH + "/" + o.getId());
+            }
+        } else if (req.getParameter("do_affiliate") != null) {
+            User byEmail = User.getByEmail(req.getParameter("email"));
+            if (byEmail != null && byEmail.canAssure()) {
+                o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
+                return new RedirectResult(ViewOrgPage.DEFAULT_PATH + "/" + o.getId());
+            } else {
+                throw new GigiApiException("Requested user is not a RA Agent. We need a RA Agent here.");
+            }
         }
-        return true;
+        throw new GigiApiException("No action could have been carried out.");
     }
 
     @Override
@@ -51,19 +57,16 @@ public class AffiliationForm extends Form {
 
             @Override
             public boolean next(Language l, Map<String, Object> vars) {
-                if ( !iter.hasNext())
+                if ( !iter.hasNext()) {
                     return false;
+                }
                 Affiliation aff = iter.next();
-                vars.put("name", aff.getTarget().getName());
-                vars.put("master", aff.isMaster() ? l.getTranslation("master") : "");
+                vars.put("name", aff.getTarget().getPreferredName());
+                vars.put("master", aff.isMaster() ? l.getTranslation("Master") : "");
                 vars.put("e-mail", aff.getTarget().getEmail());
                 return true;
             }
         });
         t.output(out, l, vars);
     }
-
-    public Organisation getOrganisation() {
-        return o;
-    }
 }