From 56f82203cd9e9a64553222dbf8831624b5c78672 Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Wed, 18 Mar 2020 14:11:52 +0100
Subject: [PATCH 1/2] fix entering group youre already part of

---
 src/main/java/mops/gruppen2/controller/Gruppen2Controller.java | 3 +++
 src/main/resources/templates/editMembers.html                  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index f1bc871..f214d1c 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -125,6 +125,9 @@ public class Gruppen2Controller {
     public String joinGroup(KeycloakAuthenticationToken token, Model model, @RequestParam(value = "id") Long id) throws EventException {
         model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
         Account account = keyCloakService.createAccountFromPrincipal (token);
+        User user = new User(account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail());
+        Group group = userService.getGroupById(id);
+        if(group.getMembers().contains(user)) return "errorRenameLater"; //hier soll eigentlich auf die bereits beigetretene Gruppe weitergeleitet werden
         controllerService.addUser(account,id);
         return "redirect:/gruppen2/";
     }
diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html
index 2cebc86..bfc0814 100644
--- a/src/main/resources/templates/editMembers.html
+++ b/src/main/resources/templates/editMembers.html
@@ -38,7 +38,7 @@
                         </tr>
                         </thead>
                         <tr th:each="member : ${group.getMembers()}">
-                            <th th:value="${member.getUser_id()}"></th>
+                            <th th:text="${member.getUser_id()}"></th>
                             <th ></th>
                             <th>
                                 <button class="btn btn-warning">Rolle ändern</button> <!-- th:if -->

From 45679c7d2a37e3d8837df17bbd524fcb07065303 Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Wed, 18 Mar 2020 14:20:32 +0100
Subject: [PATCH 2/2] Update .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5d7b69f..3ed356b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ out/
 
 ### VS Code ###
 .vscode/
+.floo
+.flooignore