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

Merge branch 'dev' into DOC-update-readme

Browse Source
This commit is contained in:
Christoph
2020-04-05 21:45:10 +02:00
parent ab9c621739 4a3aa5bc41
commit 6daf351852
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/mops/gruppen2/controller/GroupDetailsController.java
View File

@ -4,6 +4,7 @@ import mops.gruppen2.domain.Account;
import mops.gruppen2.domain.Group; import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.Role; import mops.gruppen2.domain.Role;
import mops.gruppen2.domain.User; import mops.gruppen2.domain.User;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.service.ControllerService; import mops.gruppen2.service.ControllerService;
import mops.gruppen2.service.InviteService; import mops.gruppen2.service.InviteService;
import mops.gruppen2.service.KeyCloakService; import mops.gruppen2.service.KeyCloakService;
@ -74,6 +75,8 @@ public class GroupDetailsController {
model.addAttribute("roles", group.getRoles()); model.addAttribute("roles", group.getRoles());
model.addAttribute("user", user); model.addAttribute("user", user);
model.addAttribute("admin", Role.ADMIN); model.addAttribute("admin", Role.ADMIN);
model.addAttribute("public", Visibility.PUBLIC);
model.addAttribute("private", Visibility.PRIVATE);
if (validationService.checkIfAdmin(group, user)) { if (validationService.checkIfAdmin(group, user)) {
model.addAttribute("link", serverURL + "gruppen2/acceptinvite/" + inviteService.getLinkByGroupId(group.getId())); model.addAttribute("link", serverURL + "gruppen2/acceptinvite/" + inviteService.getLinkByGroupId(group.getId()));
@ -159,6 +162,8 @@ public class GroupDetailsController {
validationService.throwIfNoAdmin(group, principle); validationService.throwIfNoAdmin(group, principle);
//TODO: checkIfAdmin checkt nicht, dass die rolle geändert wurde. oder die rolle wird nicht geändert
controllerService.changeRole(account, user, group); controllerService.changeRole(account, user, group);
if (!validationService.checkIfAdmin(group, principle)) { if (!validationService.checkIfAdmin(group, principle)) {

2
src/main/java/mops/gruppen2/service/ValidationService.java
View File

@ -93,7 +93,7 @@ public class ValidationService {
void throwIfLastAdmin(Account account, Group group) { void throwIfLastAdmin(Account account, Group group) {
if (checkIfLastAdmin(account, group)) { if (checkIfLastAdmin(account, group)) {
throw new NoAdminAfterActionException("Du Otto bist letzter Admin!"); throw new NoAdminAfterActionException("Du bist letzter Admin!");
} }
} }

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

@ -124,7 +124,8 @@
<ul class="list-group-flush" style="background: slategrey" <ul class="list-group-flush" style="background: slategrey"
th:each="member : ${group.getMembers()}"> th:each="member : ${group.getMembers()}">
<li class="list-group-item" style="background: aliceblue"> <li class="list-group-item" style="background: aliceblue">
<span th:text="${member.getId()}"></span> <span th:if='${group.getVisibility() == public}' th:text="${member.getId()}"></span>
<span th:if='${group.getVisibility() == private}' th:text="${#strings.abbreviate(member.getGivenname(), 15) + ' ' + member.getFamilyname().substring(0, 1) + '.'}"></span>
<span class="badge badge-success" <span class="badge badge-success"
th:if='${group.getRoles().get(member.getId()) == admin}'>admin</span> th:if='${group.getRoles().get(member.getId()) == admin}'>admin</span>
</li> </li>

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

@ -100,7 +100,7 @@
</thead> </thead>
<tbody class="table-striped"> <tbody class="table-striped">
<tr th:each="member : ${group.getMembers()}"> <tr th:each="member : ${group.getMembers()}">
<th th:text="${member.getId()}"></th> <th th:text="${#strings.abbreviate(member.getGivenname(), 15) + ' ' + member.getFamilyname().substring(0, 1) + '.'}"></th>
<td> <td>
<span th:if='${group.getRoles().get(member.getId()) != admin}'>Mitglied</span> <span th:if='${group.getRoles().get(member.getId()) != admin}'>Mitglied</span>
<span th:if='${group.getRoles().get(member.getId()) == admin}'>Admin</span> <span th:if='${group.getRoles().get(member.getId()) == admin}'>Admin</span>
@ -114,8 +114,7 @@
<input th:name="user_id" th:value="${member.getId()}" <input th:name="user_id" th:value="${member.getId()}"
type="hidden"> type="hidden">
<button class="btn btn-warning btn-sm" type="submit" <button class="btn btn-warning btn-sm" type="submit"
style="margin: 5px">Rolle style="margin: 5px;">Rolle ändern
ändern
</button> </button>
</form> </form>
<form method="post" <form method="post"