From 9491f83cca9b1c565fea6553de19bda565ea0762 Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Tue, 17 Mar 2020 16:57:13 +0100
Subject: [PATCH] fix roles on detailsMember.html

---
 .../java/mops/gruppen2/controller/Gruppen2Controller.java     | 1 +
 src/main/resources/templates/detailsMember.html               | 4 ++--
 2 files changed, 3 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..b42eb12 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -113,6 +113,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 a61b5e7..630ae2b 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -50,7 +50,7 @@
                 <div>
                     <h2 style="display: inline-block; margin: 0">Mitglieder</h2>
                         <form method="get" action="/gruppen2/details/members">
-                            <button th:name="group_id" th:value="${group.getId()}" th:if="${roles.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:if="${userrole == admin}" class="btn btn-secondary" type="submit" style="background: slategrey; float: right" >Mitglieder bearbeiten</button>
                         </form>
                     <p></p>
                 </div>
@@ -58,7 +58,7 @@
                     <ul th:each="member : ${group.getMembers()}" class="list-group-flush" style="background: slategrey">
                         <li  class="list-group-item" style="background: aliceblue">
                             <span th:text="${member.getUser_id()}"></span>
-                            <span th:if="${roles.get(member.getUser_id()) == admin}" class="badge badge-success">admin</span>
+                            <span th:if="${group.getRoles().get(member.getUser_id()) == admin}" class="badge badge-success">admin</span>
                         </li>
                     </ul>
                 </div>