1

Merge remote-tracking branch 'origin/master' into refactor-controllerService

# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
This commit is contained in:
Lukas Ettel
2020-03-26 14:45:43 +01:00
6 changed files with 28 additions and 6 deletions

View File

@ -55,6 +55,7 @@ public class WebController {
* @param model tolles model
* @return index.html
*/
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"})
@GetMapping("")
public String index(KeycloakAuthenticationToken token, Model model) throws EventException {
@ -325,6 +326,7 @@ public class WebController {
@RequestParam("group_id") String groupId,
KeycloakAuthenticationToken token) {
Account account = keyCloakService.createAccountFromPrincipal(token);
validationService.checkIfNewMaximumIsValid(maximum, groupId);
controllerService.updateMaxUser(account, UUID.fromString(groupId), maximum);
return "redirect:/gruppen2/details/members/" + groupId;
}