From 3d0da633b5ba51e413322ed31db84eaf705b63c4 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sun, 29 Mar 2020 17:49:33 +0200 Subject: [PATCH] change controller of csv method Co-authored-by: Christoph --- .../controller/GroupCreationController.java | 13 ------------- .../controller/GroupDetailsController.java | 14 ++++++++++++++ .../controller/GruppenfindungController.java | 1 - 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/GroupCreationController.java b/src/main/java/mops/gruppen2/controller/GroupCreationController.java index 3258b1d..ed7fcbf 100644 --- a/src/main/java/mops/gruppen2/controller/GroupCreationController.java +++ b/src/main/java/mops/gruppen2/controller/GroupCreationController.java @@ -117,17 +117,4 @@ public class GroupCreationController { return "redirect:/gruppen2"; } - - @RolesAllowed({"ROLE_orga", "ROLE_actuator"}) - @PostMapping("/details/members/addUsersFromCsv") - @CacheEvict(value = "groups", allEntries = true) - public String addUsersFromCsv(KeycloakAuthenticationToken token, - @RequestParam("group_id") String groupId, - @RequestParam(value = "file", required = false) MultipartFile file) { - - Account account = KeyCloakService.createAccountFromPrincipal(token); - controllerService.addUsersFromCsv(account, file, groupId); - - return "redirect:/gruppen2/details/members/" + groupId; - } } diff --git a/src/main/java/mops/gruppen2/controller/GroupDetailsController.java b/src/main/java/mops/gruppen2/controller/GroupDetailsController.java index 58f5dc6..faa67a2 100644 --- a/src/main/java/mops/gruppen2/controller/GroupDetailsController.java +++ b/src/main/java/mops/gruppen2/controller/GroupDetailsController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.context.annotation.SessionScope; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.security.RolesAllowed; import javax.servlet.http.HttpServletRequest; @@ -259,4 +260,17 @@ public class GroupDetailsController { return "redirect:/gruppen2"; } + + @RolesAllowed({"ROLE_orga", "ROLE_actuator"}) + @PostMapping("/details/members/addUsersFromCsv") + @CacheEvict(value = "groups", allEntries = true) + public String addUsersFromCsv(KeycloakAuthenticationToken token, + @RequestParam("group_id") String groupId, + @RequestParam(value = "file", required = false) MultipartFile file) { + + Account account = KeyCloakService.createAccountFromPrincipal(token); + controllerService.addUsersFromCsv(account, file, groupId); + + return "redirect:/gruppen2/details/members/" + groupId; + } } diff --git a/src/main/java/mops/gruppen2/controller/GruppenfindungController.java b/src/main/java/mops/gruppen2/controller/GruppenfindungController.java index f9d8010..c1e156a 100644 --- a/src/main/java/mops/gruppen2/controller/GruppenfindungController.java +++ b/src/main/java/mops/gruppen2/controller/GruppenfindungController.java @@ -34,7 +34,6 @@ public class GruppenfindungController { Model model) { Account account = KeyCloakService.createAccountFromPrincipal(token); - //TODO: new Contructor/method User user = new User(account); model.addAttribute("account", account);