diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index f220173..49cf570 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -163,6 +163,7 @@ public class Gruppen2Controller { @PostMapping("/detailsBeitreten") public String joinGroup(KeycloakAuthenticationToken token, Model model, @RequestParam("id") Long groupId) throws EventException { model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); + Account account = keyCloakService.createAccountFromPrincipal(token); User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()); Group group = userService.getGroupById(groupId); @@ -234,6 +235,7 @@ public class Gruppen2Controller { @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) @PostMapping("/details/members/deleteUser") + public String deleteUser(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId, @RequestParam("user_id") String userId) throws EventException { controllerService.deleteUser(userId, groupId); diff --git a/src/main/resources/templates/create.html b/src/main/resources/templates/create.html index 2b93f80..663f4a2 100644 --- a/src/main/resources/templates/create.html +++ b/src/main/resources/templates/create.html @@ -34,8 +34,8 @@

Gruppenerstellung

-
+
+
-
+

-
+

-
+
Mitglied Rolle - Optionen + Optionen - @@ -104,6 +103,8 @@ type="button"> Fertig +
+
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index 5ea8655..87383ce 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -10,7 +10,7 @@ Seite nicht gefunden -
+

UPSI

@@ -31,4 +31,4 @@
- + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index cf38815..6089e2f 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -45,7 +45,7 @@


-
+

diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html index 0d41f05..1a9b51c 100644 --- a/src/main/resources/templates/search.html +++ b/src/main/resources/templates/search.html @@ -33,7 +33,7 @@

Gruppensuche

-
+