From 5703ad4678afadf7221fee05bf6a3cf4cd9c3095 Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Wed, 18 Mar 2020 13:40:07 +0100
Subject: [PATCH] fix random error

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

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index badc434..2fcb24d 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -23,6 +23,7 @@ import org.springframework.web.server.ResponseStatusException;
 import javax.annotation.security.RolesAllowed;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 @Controller
@@ -113,6 +114,7 @@ public class Gruppen2Controller {
             model.addAttribute("group", group);
             model.addAttribute("roles", group.getRoles());
             model.addAttribute("user", user);
+            model.addAttribute("userrole", group.getRoles().get(user.getUser_id()));
             model.addAttribute("admin", Role.ADMIN);
             return "detailsMember";
         }
diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index e5189a9..1274df0 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -49,9 +49,11 @@
             <div class="col-3" style="white-space: nowrap">
                 <div>
                     <h2 style="display: inline-block; margin: 0">Mitglieder</h2>
+                    <div th:if='${group.getRoles().get(user.getUser_id()) == admin}'>
                         <form method="get" action="/gruppen2/details/members">
-                            <button th:name="group_id" th:value="${group.getId()}" th:if='${group.getRoles().get(user.getUser_id()) == admin}' class="btn btn-secondary" type="submit" style="background: slategrey; float: right" >Mitglieder bearbeiten</button>
+                                <button th:name="group_id" th:value="${group.getId()}" class="btn btn-secondary" type="submit" style="background: slategrey; float: right" >Mitglieder bearbeiten</button>
                         </form>
+                    </div>
                     <p></p>
                 </div>
                 <div>
diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html
index d5983d8..2cebc86 100644
--- a/src/main/resources/templates/editMembers.html
+++ b/src/main/resources/templates/editMembers.html
@@ -39,7 +39,7 @@
                         </thead>
                         <tr th:each="member : ${group.getMembers()}">
                             <th th:value="${member.getUser_id()}"></th>
-                            <th th:text="${group.getRoles.get(member.getUser_id())}"></th>
+                            <th ></th>
                             <th>
                                 <button class="btn btn-warning">Rolle ändern</button> <!-- th:if -->
                                 <button class="btn btn-danger">Mitglied entfernen</button>