From 86c9bd900754357e408df697b82ff408cd96bdd0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Mon, 21 Aug 2017 01:00:28 +0200
Subject: [PATCH] fix: prompt for confirmation when removing org admins

Change-Id: I653808751fb3f7ebb8cd65974768fe8614ab72ae
---
 src/club/wpia/gigi/pages/orga/AffiliationForm.java  | 7 +++++--
 src/club/wpia/gigi/pages/orga/AffiliationForm.templ | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/club/wpia/gigi/pages/orga/AffiliationForm.java b/src/club/wpia/gigi/pages/orga/AffiliationForm.java
index 58ab93bf..278e38b7 100644
--- a/src/club/wpia/gigi/pages/orga/AffiliationForm.java
+++ b/src/club/wpia/gigi/pages/orga/AffiliationForm.java
@@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletRequest;
 
 import club.wpia.gigi.GigiApiException;
 import club.wpia.gigi.dbObjects.Organisation;
-import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.dbObjects.Organisation.Affiliation;
+import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.output.template.Form;
 import club.wpia.gigi.output.template.IterableDataset;
@@ -38,7 +38,10 @@ public class AffiliationForm extends Form {
             }
         } else if (req.getParameter("do_affiliate") != null) {
             User byEmail = User.getByEmail(req.getParameter("email"));
-            if (byEmail != null && byEmail.canVerify()) {
+            if (byEmail == null) {
+                throw new GigiApiException("To add an admin, the email address is required.");
+            }
+            if (byEmail.canVerify()) {
                 o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
                 return new RedirectResult(ViewOrgPage.DEFAULT_PATH + "/" + o.getId());
             } else {
diff --git a/src/club/wpia/gigi/pages/orga/AffiliationForm.templ b/src/club/wpia/gigi/pages/orga/AffiliationForm.templ
index b44d0bde..6d8c4f2b 100644
--- a/src/club/wpia/gigi/pages/orga/AffiliationForm.templ
+++ b/src/club/wpia/gigi/pages/orga/AffiliationForm.templ
@@ -10,12 +10,12 @@
     <td><?=$name?></td>
     <td><?=$e-mail?></td>
     <td><?=$master?></td>
-    <td><button class="btn btn-warning" type="submit" name="del" value="<?=$e-mail?>">X</button> </td>
+    <td><button class="btn btn-warning btn-confirm" data-confirm="<?=_Do you really want to delete the affiliation of ${e-mail} to this organisation??>" data-reply="<?=_Cancel?>,<?=_Delete?>" type="submit" name="del" value="<?=$e-mail?>">X</button> </td>
   </tr>
 <? } ?>
   <tr>
     <td></td>
-    <td><input class="form-control" type="text" name="email" required></td>
+    <td><input class="form-control" type="text" name="email"></td>
     <td><input type="checkbox" name="master" value="y"></td>
     <td><input class="btn btn-primary" type="submit" name="do_affiliate" value="<?=_Add?>"></td>
   </tr>
-- 
2.39.2