From a868ea86b4445654743c697e197f26ddf42ab4ed Mon Sep 17 00:00:00 2001 From: killerber4t Date: Tue, 17 Mar 2020 15:31:53 +0100 Subject: [PATCH] add edit-members to controller Co-Authored-By: xxnitram --- .../gruppen2/controller/Gruppen2Controller.java | 17 ++++++++++++++++- src/main/resources/templates/detailsMember.html | 4 +++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index ddc90f8..bff25aa 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -4,6 +4,7 @@ import mops.gruppen2.config.Gruppen2Config; import mops.gruppen2.domain.Exceptions.EventException; import mops.gruppen2.domain.Group; +import mops.gruppen2.domain.Role; import mops.gruppen2.domain.User; import mops.gruppen2.domain.event.CreateGroupEvent; import mops.gruppen2.security.Account; @@ -83,7 +84,6 @@ public class Gruppen2Controller { return "search"; } - @PostMapping("/createGroup") public String pCreateGroup(KeycloakAuthenticationToken token, @RequestParam(value = "title") String title, @@ -135,4 +135,19 @@ public class Gruppen2Controller { controllerService.deleteUser(account, id); return "redirect:/gruppen2/"; } + + @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) + @GetMapping("/details/members") + public String editMembers(Model model, KeycloakAuthenticationToken token, @RequestParam (value="group_id") Long id) throws EventException { + Account account = keyCloakService.createAccountFromPrincipal(token); + Group group = userService.getGroupById(id); + if(group.getRoles().get(account.getName()) == Role.ADMIN) { + model.addAttribute("members", group.getMembers()); + model.addAttribute("group", group); + return "editMembers"; + } else { + return "redirect:/details/"; + } + } + } diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 6086619..85c697b 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -49,7 +49,9 @@

Mitglieder

- +
+ +