christoph/lecture-professional-software-development
1
Fork 0
Code Activity

fix roles on detailsMember.html

Browse Source
This commit is contained in:
killerber4t
2020-03-17 16:42:31 +01:00
parent 3036f76b37
commit 47ee171070
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -111,7 +111,9 @@ public class Gruppen2Controller {
User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()); User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
if(group!= null) { if(group!= null) {
model.addAttribute("group", group); model.addAttribute("group", group);
model.addAttribute("role", group.getRoles().get(user.getUser_id())); model.addAttribute("roles", group.getRoles());
model.addAttribute("user", user);
model.addAttribute("admin", Role.ADMIN);
return "detailsMember"; return "detailsMember";
} }
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found"); throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found");

4
src/main/resources/templates/detailsMember.html
View File

@ -50,7 +50,7 @@
<div> <div>
<h2 style="display: inline-block; margin: 0">Mitglieder</h2> <h2 style="display: inline-block; margin: 0">Mitglieder</h2>
<form method="get" action="/gruppen2/details/members"> <form method="get" action="/gruppen2/details/members">
<button th:if="${role == role.ADMIN}" class="btn btn-secondary" type="submit" style="background: slategrey; float: right" >Mitglieder bearbeiten</button> <button th:if="${roles.get(user.getUser_id() == admin)}" class="btn btn-secondary" type="submit" style="background: slategrey; float: right" >Mitglieder bearbeiten</button>
</form> </form>
<p></p> <p></p>
</div> </div>
@ -58,7 +58,7 @@
<ul th:each="member : ${group.getMembers()}" class="list-group-flush" style="background: slategrey"> <ul th:each="member : ${group.getMembers()}" class="list-group-flush" style="background: slategrey">
<li class="list-group-item" style="background: aliceblue"> <li class="list-group-item" style="background: aliceblue">
<span th:text="${member.getUser_id()}"></span> <span th:text="${member.getUser_id()}"></span>
<span th:if="${role == role.ADMIN}" class="badge badge-success">admin</span> <span th:if="${roles.get(member.getUser_id()) == admin}" class="badge badge-success">admin</span>
</li> </li>
</ul> </ul>
</div> </div>