aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/api/security
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2022-09-18 10:09:02 -0700
committerGitHub <noreply@github.com>2022-09-18 10:09:02 -0700
commitd702c9caf113ca761c57f811b128f8188c9dec0c (patch)
tree8891e32d889f68ccbb294585bc0ff89875583567 /src/main/java/org/traccar/api/security
parentd4513fa86539577e24ede46d40748d8d034b025c (diff)
parent4de8efe1ef0810af492c161bfc1d3200958d75d8 (diff)
downloadtrackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.tar.gz
trackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.tar.bz2
trackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.zip
Merge branch 'master' into ndtpv6-dev
Diffstat (limited to 'src/main/java/org/traccar/api/security')
-rw-r--r--src/main/java/org/traccar/api/security/PermissionsService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/api/security/PermissionsService.java b/src/main/java/org/traccar/api/security/PermissionsService.java
index a494c0257..ddfaaab94 100644
--- a/src/main/java/org/traccar/api/security/PermissionsService.java
+++ b/src/main/java/org/traccar/api/security/PermissionsService.java
@@ -170,8 +170,10 @@ public class PermissionsService {
|| before.getFixedEmail() != after.getFixedEmail()) {
if (userId == after.getId()) {
checkAdmin(userId);
- } else {
+ } else if (after.getId() > 0) {
checkUser(userId, after.getId());
+ } else {
+ checkManager(userId);
}
}
if (before.getFixedEmail() && !before.getEmail().equals(after.getEmail())) {