diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index c71ae8d..a5116d6 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -112,4 +112,16 @@ public class Gruppen2Controller { throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found"); } + @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) + @GetMapping("/detailsSearch") + public String showGroupDetailsNoMember (KeycloakAuthenticationToken token, Model model, @RequestParam (value="id") Long id) throws EventException { + model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); + Group group = userService.getGroupById(id); + if (group!=null) { + model.addAttribute("group", group); + return "detailsNoMember"; + } + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found"); + } + } diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html index f351207..e12d035 100644 --- a/src/main/resources/templates/detailsNoMember.html +++ b/src/main/resources/templates/detailsNoMember.html @@ -25,7 +25,26 @@
- +
+
+
+
+

+

+ Private Gruppe + Öffentliche Gruppe + Veranstaltung +

+

+
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/errorRenameLater.html b/src/main/resources/templates/errorRenameLater.html new file mode 100644 index 0000000..01fbadc --- /dev/null +++ b/src/main/resources/templates/errorRenameLater.html @@ -0,0 +1,26 @@ + + + + + + + + + Error + + +
+
+

Da ist etwas schiefgelaufen!

+

Die Seite, nach der du suchst, scheint nicht zu existieren.

+
+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html index 832d6c3..4eab94f 100644 --- a/src/main/resources/templates/search.html +++ b/src/main/resources/templates/search.html @@ -35,30 +35,31 @@ - - - -
- - - - - - - - - - - - - - - - - - -
GruppennameBeschreibungÖffentlich/PrivatMitgliederanzahl
GruppennameBeschreibungÖffentlichMitgliederanzahl
- + +
+ + + + + + + + + + + + + + + + + + +
GruppennameBeschreibungÖffentlich/PrivatMitgliederanzahl
+ Gruppenname + BeschreibungÖffentlichMitgliederanzahl
+ +