FIX: affiliation form with associated test cases.

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

diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
index c4b65ca965bb3ba062b696c4109717abffb48045..16c8bc5388a7b90e4a815c853c54444b93bf136e 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
+++ b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
@@ -43,10 +43,11 @@ public class ViewOrgPage extends Page {
             if ( !u.isInGroup(CreateOrgPage.ORG_ASSURER)) {
                 return;
             }
-            if (req.getParameter("affiliate") != null) {
+            if (req.getParameter("do_affiliate") != null || req.getParameter("del") != null) {
                 AffiliationForm form = Form.getForm(req, AffiliationForm.class);
-                form.submit(resp.getWriter(), req);
-                resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
+                if (form.submit(resp.getWriter(), req)) {
+                    resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
+                }
             } else {
                 Form.getForm(req, CreateOrgForm.class).submit(resp.getWriter(), req);
             }
@@ -96,8 +97,9 @@ public class ViewOrgPage extends Page {
 
             @Override
             public boolean next(Language l, Map<String, Object> vars) {
-                if (count >= orgas.length)
+                if (count >= orgas.length) {
                     return false;
+                }
                 Organisation org = orgas[count++];
                 vars.put("id", Integer.toString(org.getId()));
                 vars.put("name", org.getName());