_Bastler/we.bstly-back
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix permissions

Browse Source
This commit is contained in:
_Bastler 2023-01-02 08:24:06 +01:00
parent e20266f147
commit dfab9d09c3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/de/bstly/we/businesslogic/PermissionManager.java
View File

@ -418,8 +418,8 @@ public class PermissionManager implements UserDataProvider {
for (Permission existingPermission : existingPermissions) { for (Permission existingPermission : existingPermissions) {
if (existingPermission.getExpires().isBefore(permissionsExpires)) { if (existingPermission.getExpires().isBefore(permissionsExpires)) {
if (starts != null) { if (starts != null) {
if (existingPermission.getStarts() == null if (existingPermission.getStarts() == null || existingPermission.getStarts().isAfter(starts)
|| existingPermission.getStarts().isAfter(starts)) { || existingPermission.getExpires().isAfter(starts)) {
permission = existingPermission; permission = existingPermission;
break; break;
} }

2
pom.xml
View File

@ -13,7 +13,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version> <java.version>11</java.version>
<log4j2.version>2.19.0</log4j2.version> <log4j2.version>2.19.0</log4j2.version>
<revision>2.0.4-SNAPSHOT</revision> <revision>2.0.5-SNAPSHOT</revision>
</properties> </properties>
<parent> <parent>