church/BiCO
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

using Kinderstunde klein for date privileges

Browse Source
This commit is contained in:
Jottyfan
2024-07-30 11:22:50 +02:00
parent e3ebc387bb
commit d28f6b45fc
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -8,7 +8,7 @@ plugins {
} }
group = 'de.jottyfan.bico' group = 'de.jottyfan.bico'
version = '0.1.1' version = '0.1.2'
description = """BibleClassOrganizer""" description = """BibleClassOrganizer"""

6
src/main/java/de/jottyfan/bico/modules/CommonController.java
View File

@ -43,14 +43,14 @@ public abstract class CommonController {
} }
} }
@ModelAttribute("hasDiakoneRole") @ModelAttribute("hasDateRole")
public Boolean hasDiakoneRole(Principal principal) { public Boolean hasDateRole(Principal principal) {
OAuth2AuthenticationToken token = (OAuth2AuthenticationToken) principal; OAuth2AuthenticationToken token = (OAuth2AuthenticationToken) principal;
if (token != null) { if (token != null) {
OAuth2User user = token.getPrincipal(); OAuth2User user = token.getPrincipal();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<String> roles = (List<String>) user.getAttributes().get("roles"); List<String> roles = (List<String>) user.getAttributes().get("roles");
return roles.contains("Diakone"); return roles.contains("Kinderstunde klein");
} else { } else {
LOGGER.warn("token is null, no roles can be detected"); LOGGER.warn("token is null, no roles can be detected");
return false; return false;

2
src/main/resources/templates/next.html
View File

@ -3,7 +3,7 @@
<body> <body>
<th:block layout:fragment="content"> <th:block layout:fragment="content">
<div class="borderdist"> <div class="borderdist">
<div class="container" sec:authorize="hasAnyRole('Diakone', 'Bibelunterricht')"> <div class="container" sec:authorize="hasAnyRole('Kinderstunde klein', 'Bibelunterricht')">
<div class="row"> <div class="row">
<div class="col-sm-6 col-md-4 col-lg-2 card p-2 m-1" th:each="s : ${list}"> <div class="col-sm-6 col-md-4 col-lg-2 card p-2 m-1" th:each="s : ${list}">
<div th:text="${#temporals.format(s.day, 'dd.MM.yyyy')}"></div> <div th:text="${#temporals.format(s.day, 'dd.MM.yyyy')}"></div>

6
src/main/resources/templates/template.html
View File

@ -21,7 +21,7 @@
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent" style="margin-right: 20px"> <div class="collapse navbar-collapse" id="navbarSupportedContent" style="margin-right: 20px">
<ul class="navbar-nav mb-2 mb-lg-0" th:if="${hasBUrole || hasDiakoneRole}"> <ul class="navbar-nav mb-2 mb-lg-0" th:if="${hasBUrole || hasDateRole}">
<li class="nav-item"><a class="btn btn-outline-secondary" th:href="@{/next}" style="margin-left: 12px">Dienstplan</a></li> <li class="nav-item"><a class="btn btn-outline-secondary" th:href="@{/next}" style="margin-left: 12px">Dienstplan</a></li>
<li class="nav-item"><a class="btn btn-outline-secondary" th:href="@{/sheet}" style="margin-left: 12px" th:if="${hasBUrole}">Einteilung</a></li> <li class="nav-item"><a class="btn btn-outline-secondary" th:href="@{/sheet}" style="margin-left: 12px" th:if="${hasBUrole}">Einteilung</a></li>
<li class="nav-item"><a class="btn btn-outline-secondary" th:href="@{/subject/list}" style="margin-left: 12px" th:if="${hasBUrole}">Themen</a></li> <li class="nav-item"><a class="btn btn-outline-secondary" th:href="@{/subject/list}" style="margin-left: 12px" th:if="${hasBUrole}">Themen</a></li>
@ -41,8 +41,8 @@
</ul> </ul>
</div> </div>
</nav> </nav>
<div layout:fragment="content" th:if="${hasBUrole || hasDiakoneRole}">content</div> <div layout:fragment="content" th:if="${hasBUrole || hasDateRole}">content</div>
<div th:unless="${hasBUrole || hasDiakoneRole}"> <div th:unless="${hasBUrole || hasDateRole}">
<div class="borderdist"> <div class="borderdist">
<div class="alert alert-danger">Leider fehlen Ihnen die Berechtigungen, um diese Anwendung nutzen zu können.</div> <div class="alert alert-danger">Leider fehlen Ihnen die Berechtigungen, um diese Anwendung nutzen zu können.</div>
</div> </div>