From 814959c59c0265918fec0da839a1571b4137957f Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 9 Apr 2020 21:23:11 +0200 Subject: [PATCH 01/36] rename templates --- .../mops/gruppen2/controller/GroupCreationController.java | 4 ++-- .../mops/gruppen2/controller/GroupDetailsController.java | 8 ++++---- .../controller/ModelAttributeControllerAdvice.java | 1 + .../gruppen2/controller/SearchAndInviteController.java | 2 +- .../templates/{createOrga.html => create_orga.html} | 0 .../templates/{createStudent.html => create_student.html} | 0 .../templates/{detailsMember.html => details_member.html} | 0 .../{detailsNoMember.html => details_nomember.html} | 0 .../resources/templates/{joinprivate.html => join.html} | 0 .../templates/{editMembers.html => members.html} | 0 .../templates/{changeMetadata.html => meta.html} | 0 11 files changed, 8 insertions(+), 7 deletions(-) rename src/main/resources/templates/{createOrga.html => create_orga.html} (100%) rename src/main/resources/templates/{createStudent.html => create_student.html} (100%) rename src/main/resources/templates/{detailsMember.html => details_member.html} (100%) rename src/main/resources/templates/{detailsNoMember.html => details_nomember.html} (100%) rename src/main/resources/templates/{joinprivate.html => join.html} (100%) rename src/main/resources/templates/{editMembers.html => members.html} (100%) rename src/main/resources/templates/{changeMetadata.html => meta.html} (100%) diff --git a/src/main/java/mops/gruppen2/controller/GroupCreationController.java b/src/main/java/mops/gruppen2/controller/GroupCreationController.java index d3293f3..3976e61 100644 --- a/src/main/java/mops/gruppen2/controller/GroupCreationController.java +++ b/src/main/java/mops/gruppen2/controller/GroupCreationController.java @@ -47,7 +47,7 @@ public class GroupCreationController { model.addAttribute("lectures", projectionService.projectLectures()); - return "createOrga"; + return "create_orga"; } @RolesAllowed("ROLE_orga") @@ -83,7 +83,7 @@ public class GroupCreationController { model.addAttribute("lectures", projectionService.projectLectures()); - return "createStudent"; + return "create_student"; } @RolesAllowed("ROLE_studentin") diff --git a/src/main/java/mops/gruppen2/controller/GroupDetailsController.java b/src/main/java/mops/gruppen2/controller/GroupDetailsController.java index 6e85699..534ed94 100644 --- a/src/main/java/mops/gruppen2/controller/GroupDetailsController.java +++ b/src/main/java/mops/gruppen2/controller/GroupDetailsController.java @@ -67,10 +67,10 @@ public class GroupDetailsController { // Detailseite für nicht-Mitglieder if (!ValidationService.checkIfMember(group, user)) { - return "detailsNoMember"; + return "details_nomember"; } - return "detailsMember"; + return "details_member"; } @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @@ -128,7 +128,7 @@ public class GroupDetailsController { model.addAttribute("group", group); - return "changeMetadata"; + return "meta"; } @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @@ -161,7 +161,7 @@ public class GroupDetailsController { model.addAttribute("group", group); - return "editMembers"; + return "members"; } @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) diff --git a/src/main/java/mops/gruppen2/controller/ModelAttributeControllerAdvice.java b/src/main/java/mops/gruppen2/controller/ModelAttributeControllerAdvice.java index 0519aed..fd4a62e 100644 --- a/src/main/java/mops/gruppen2/controller/ModelAttributeControllerAdvice.java +++ b/src/main/java/mops/gruppen2/controller/ModelAttributeControllerAdvice.java @@ -24,6 +24,7 @@ public class ModelAttributeControllerAdvice { model.addAttribute("user", new User(token)); } + // Add enums model.addAttribute("member", Role.MEMBER); model.addAttribute("admin", Role.ADMIN); model.addAttribute("public", Visibility.PUBLIC); diff --git a/src/main/java/mops/gruppen2/controller/SearchAndInviteController.java b/src/main/java/mops/gruppen2/controller/SearchAndInviteController.java index ea7334f..e759d0b 100644 --- a/src/main/java/mops/gruppen2/controller/SearchAndInviteController.java +++ b/src/main/java/mops/gruppen2/controller/SearchAndInviteController.java @@ -83,6 +83,6 @@ public class SearchAndInviteController { return "redirect:/gruppen2/details/" + group.getId(); } - return "joinprivate"; + return "join"; } } diff --git a/src/main/resources/templates/createOrga.html b/src/main/resources/templates/create_orga.html similarity index 100% rename from src/main/resources/templates/createOrga.html rename to src/main/resources/templates/create_orga.html diff --git a/src/main/resources/templates/createStudent.html b/src/main/resources/templates/create_student.html similarity index 100% rename from src/main/resources/templates/createStudent.html rename to src/main/resources/templates/create_student.html diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/details_member.html similarity index 100% rename from src/main/resources/templates/detailsMember.html rename to src/main/resources/templates/details_member.html diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/details_nomember.html similarity index 100% rename from src/main/resources/templates/detailsNoMember.html rename to src/main/resources/templates/details_nomember.html diff --git a/src/main/resources/templates/joinprivate.html b/src/main/resources/templates/join.html similarity index 100% rename from src/main/resources/templates/joinprivate.html rename to src/main/resources/templates/join.html diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/members.html similarity index 100% rename from src/main/resources/templates/editMembers.html rename to src/main/resources/templates/members.html diff --git a/src/main/resources/templates/changeMetadata.html b/src/main/resources/templates/meta.html similarity index 100% rename from src/main/resources/templates/changeMetadata.html rename to src/main/resources/templates/meta.html From d7d752e2171ef30adb39f24aed3245bc1671cc24 Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 9 Apr 2020 22:05:21 +0200 Subject: [PATCH 02/36] fix navigation --- .../controller/GroupCreationController.java | 22 ++++++++----------- src/main/resources/templates/create_orga.html | 13 +++++------ .../resources/templates/create_student.html | 13 +++++------ .../resources/templates/details_member.html | 15 +++++-------- .../resources/templates/details_nomember.html | 11 ++++------ src/main/resources/templates/index.html | 16 +++++--------- src/main/resources/templates/join.html | 16 +++++--------- src/main/resources/templates/members.html | 15 +++++-------- src/main/resources/templates/meta.html | 16 +++++--------- src/main/resources/templates/search.html | 14 +++++------- 10 files changed, 58 insertions(+), 93 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/GroupCreationController.java b/src/main/java/mops/gruppen2/controller/GroupCreationController.java index 3976e61..1580788 100644 --- a/src/main/java/mops/gruppen2/controller/GroupCreationController.java +++ b/src/main/java/mops/gruppen2/controller/GroupCreationController.java @@ -41,13 +41,18 @@ public class GroupCreationController { this.projectionService = projectionService; } - @RolesAllowed("ROLE_orga") - @GetMapping("/create/orga") - public String getCreateOrga(Model model) { + @RolesAllowed({"ROLE_orga", "ROLE_student"}) + @GetMapping("/create") + public String getCreate(KeycloakAuthenticationToken token, + Model model) { model.addAttribute("lectures", projectionService.projectLectures()); - return "create_orga"; + if (token.getAccount().getRoles().contains("orga")) { + return "create_orga"; + } + + return "create_student"; } @RolesAllowed("ROLE_orga") @@ -77,15 +82,6 @@ public class GroupCreationController { return "redirect:/gruppen2/details/" + IdService.uuidToString(group.getId()); } - @RolesAllowed("ROLE_studentin") - @GetMapping("/create/student") - public String getCreateStudent(Model model) { - - model.addAttribute("lectures", projectionService.projectLectures()); - - return "create_student"; - } - @RolesAllowed("ROLE_studentin") @PostMapping("/create/student") @CacheEvict(value = "groups", allEntries = true) diff --git a/src/main/resources/templates/create_orga.html b/src/main/resources/templates/create_orga.html index 8399c7c..6b1526a 100644 --- a/src/main/resources/templates/create_orga.html +++ b/src/main/resources/templates/create_orga.html @@ -19,19 +19,16 @@
-