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

fix random error

Browse Source
This commit is contained in:
killerber4t
2020-03-18 13:40:07 +01:00
parent 5f1cdca4ee
commit 5703ad4678
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import org.springframework.web.server.ResponseStatusException;
import javax.annotation.security.RolesAllowed; import javax.annotation.security.RolesAllowed;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
@Controller @Controller
@ -113,6 +114,7 @@ public class Gruppen2Controller {
model.addAttribute("group", group); model.addAttribute("group", group);
model.addAttribute("roles", group.getRoles()); model.addAttribute("roles", group.getRoles());
model.addAttribute("user", user); model.addAttribute("user", user);
model.addAttribute("userrole", group.getRoles().get(user.getUser_id()));
model.addAttribute("admin", Role.ADMIN); model.addAttribute("admin", Role.ADMIN);
return "detailsMember"; return "detailsMember";
} }

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

@ -49,9 +49,11 @@
<div class="col-3" style="white-space: nowrap"> <div class="col-3" style="white-space: nowrap">
<div> <div>
<h2 style="display: inline-block; margin: 0">Mitglieder</h2> <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"> <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> </form>
</div>
<p></p> <p></p>
</div> </div>
<div> <div>

2
src/main/resources/templates/editMembers.html
View File

@ -39,7 +39,7 @@
</thead> </thead>
<tr th:each="member : ${group.getMembers()}"> <tr th:each="member : ${group.getMembers()}">
<th th:value="${member.getUser_id()}"></th> <th th:value="${member.getUser_id()}"></th>
<th th:text="${group.getRoles.get(member.getUser_id())}"></th> <th ></th>
<th> <th>
<button class="btn btn-warning">Rolle ändern</button> <!-- th:if --> <button class="btn btn-warning">Rolle ändern</button> <!-- th:if -->
<button class="btn btn-danger">Mitglied entfernen</button> <button class="btn btn-danger">Mitglied entfernen</button>