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:49:28 -0700
committerGitHub <noreply@github.com>2022-09-18 10:49:28 -0700
commitb118bd4cc8a64e768370ef19061e0f968136cf18 (patch)
tree0f88d08b2e51d5285dde5ed7acdace5293be8373 /src/main/java/org/traccar/api/security
parentd55ae464806430ee57bbd56737f024ead95748a2 (diff)
parent8532bffcec8e239c6699845e09e63da927f51d9a (diff)
downloadtrackermap-server-b118bd4cc8a64e768370ef19061e0f968136cf18.tar.gz
trackermap-server-b118bd4cc8a64e768370ef19061e0f968136cf18.tar.bz2
trackermap-server-b118bd4cc8a64e768370ef19061e0f968136cf18.zip
Merge branch 'master' into g1rus-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())) {