diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index dd6f673..9518740 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -79,7 +79,8 @@ public class Gruppen2Controller { @RequestParam(value = "visibility", required = false) Boolean visibility) { Account account = keyCloakService.createAccountFromPrincipal(token); - controllerService.createGroup(account, title, beschreibung); + if (visibility == null) visibility=false; + controllerService.createGroup(account, title, beschreibung, visibility); return "redirect:/gruppen2/"; } diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index a1ca2c3..afb861d 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -26,10 +26,15 @@ public class ControllerService { * @param title Gruppentitel * @param description Gruppenbeschreibung */ - public void createGroup(Account account, String title, String description) { - + public void createGroup(Account account, String title, String description, Boolean visibility) { + Visibility visibility1; + if (visibility){ + visibility1 = Visibility.PUBLIC; + }else{ + visibility1 = Visibility.PRIVATE; + } List eventList = new ArrayList<>(); - Collections.addAll(eventList, new CreateGroupEvent(eventService.checkGroup(), account.getName(), null , GroupType.LECTURE, Visibility.PUBLIC), + Collections.addAll(eventList, new CreateGroupEvent(eventService.checkGroup(), account.getName(), null , GroupType.LECTURE, visibility1), new AddUserEvent(eventService.checkGroup(), account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail()), new UpdateRoleEvent(eventService.checkGroup(), account.getName(), Role.ADMIN), new UpdateGroupTitleEvent(eventService.checkGroup(), account.getName(), title), diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 412a194..646bc22 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -31,8 +31,9 @@

- Private Gruppe - Öffentliche Gruppe + Private Gruppe + Öffentliche Gruppe + Veranstaltung

@@ -42,18 +43,21 @@
-
-

Mitglieder

- - - -

- + +
+
+

Mitglieder

+ +

+
+
+
    +
  • + + admin +
  • +
+