christoph/lecture-professional-software-development
1
Fork 0
Code Activity

fix navigation

Browse Source
This commit is contained in:
Christoph
2020-04-09 22:05:21 +02:00
parent 814959c59c
commit d7d752e217
10 changed files with 58 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/mops/gruppen2/controller/GroupCreationController.java
View File

@ -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)

13
src/main/resources/templates/create_orga.html
View File

@ -19,19 +19,16 @@
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation" th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li>
<a th:href="@{/gruppen2}" href="/">Gruppen</a>
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li th:case="${true}" class="active">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}" class="active">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<li class="active">
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li>
<a th:href="@{/gruppen2/search}" href="/search">Suche</a>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>

13
src/main/resources/templates/create_student.html
View File

@ -15,19 +15,16 @@
</head>
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation" th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li>
<a th:href="@{/gruppen2}" href="/">Gruppen</a>
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li th:case="${true}" class="active">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}" class="active">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<li class="active">
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li>
<a th:href="@{/gruppen2/search}" href="/search">Suche</a>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>

15
src/main/resources/templates/details_member.html
View File

@ -12,19 +12,16 @@
</head>
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation" th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li class="active">
<a href="/" th:href="@{/gruppen2}">Gruppen</a>
</li>
<li th:case="${true}">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li>
<a href="/search" th:href="@{/gruppen2/search}">Suche</a>
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>

11
src/main/resources/templates/details_nomember.html
View File

@ -10,19 +10,16 @@
</head>
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation" th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li>
<a th:href="@{/gruppen2}" href="/">Gruppen</a>
</li>
<li th:case="${true}">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<li>
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li class="active">
<a th:href="@{/gruppen2/search}" href="/search">Suche</a>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>

16
src/main/resources/templates/index.html
View File

@ -10,20 +10,16 @@
</head>
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation"
th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li class="active">
<a href="/" th:href="@{/gruppen2}">Gruppen</a>
</li>
<li th:case="${true}">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li>
<a href="/search" th:href="@{/gruppen2/search}">Suche</a>
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>

16
src/main/resources/templates/join.html
View File

@ -4,7 +4,7 @@
xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>Gruppendetails</title>
<title>Gruppe Beitreten</title>
<th:block th:fragment="headcontent">
<!-- Links, Skripts, Styles hier einfügen! -->
</th:block>
@ -12,20 +12,16 @@
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation"
th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li>
<a href="/" th:href="@{/gruppen2}">Gruppen</a>
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li th:case="${true}">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<li>
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li class="active">
<a href="/search" th:href="@{/gruppen2/search}">Suche</a>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>

15
src/main/resources/templates/members.html
View File

@ -15,19 +15,16 @@
</head>
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation" th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li class="active">
<a th:href="@{/gruppen2}" href="/">Gruppen</a>
</li>
<li th:case="${true}">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li>
<a th:href="@{/gruppen2/search}" href="/search">Suche</a>
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>

16
src/main/resources/templates/meta.html
View File

@ -17,20 +17,16 @@
</head>
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation"
th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li class="active">
<a href="/" th:href="@{/gruppen2}">Gruppen</a>
</li>
<li th:case="${true}">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li>
<a href="/search" th:href="@{/gruppen2/search}">Suche</a>
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>

14
src/main/resources/templates/search.html
View File

@ -10,20 +10,16 @@
</head>
<body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation"
th:switch="${account.getRoles().contains('orga')}">
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li>
<a th:href="@{/gruppen2}" href="/">Gruppen</a>
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li th:case="${true}">
<a href="/create/orga" th:href="@{/gruppen2/create/orga}">Erstellen</a>
</li>
<li th:case="${false}">
<a href="/create/student" th:href="@{/gruppen2/create/student}">Erstellen</a>
<li>
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li class="active">
<a th:href="@{/gruppen2/search}" href="/search">Suche</a>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>