diff options
author | Anton Tananaev <anton@traccar.org> | 2022-06-16 07:09:00 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-06-16 07:09:00 -0700 |
commit | d3e83f9fa0d066e5a15fde225599cc43071c031a (patch) | |
tree | 0ed36805063b795fb5f2e30ad785a9222ef00990 /src/main/java/org/traccar/database/PermissionsManager.java | |
parent | d3fd20d4a4f7dc647e75c5a0cb962759630ed967 (diff) | |
download | trackermap-server-d3e83f9fa0d066e5a15fde225599cc43071c031a.tar.gz trackermap-server-d3e83f9fa0d066e5a15fde225599cc43071c031a.tar.bz2 trackermap-server-d3e83f9fa0d066e5a15fde225599cc43071c031a.zip |
Remove groups manager
Diffstat (limited to 'src/main/java/org/traccar/database/PermissionsManager.java')
-rw-r--r-- | src/main/java/org/traccar/database/PermissionsManager.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java index 833480eea..595e236fa 100644 --- a/src/main/java/org/traccar/database/PermissionsManager.java +++ b/src/main/java/org/traccar/database/PermissionsManager.java @@ -162,9 +162,8 @@ public class PermissionsManager { groupPermissions.clear(); devicePermissions.clear(); try { - GroupTree groupTree = new GroupTree(Context.getGroupsManager().getItems( - Context.getGroupsManager().getAllItems()), - Context.getDeviceManager().getAllDevices()); + var groups = dataManager.getObjects(Group.class); + GroupTree groupTree = new GroupTree(groups, Context.getDeviceManager().getAllDevices()); for (Permission groupPermission : dataManager.getPermissions(User.class, Group.class)) { Set<Long> userGroupPermissions = getGroupPermissions(groupPermission.getOwnerId()); Set<Long> userDevicePermissions = getDevicePermissions(groupPermission.getOwnerId()); @@ -182,9 +181,9 @@ public class PermissionsManager { } groupDevices.clear(); - for (long groupId : Context.getGroupsManager().getAllItems()) { - for (Device device : groupTree.getDevices(groupId)) { - getGroupDevices(groupId).add(device.getId()); + for (var group : groups) { + for (Device device : groupTree.getDevices(group.getId())) { + getGroupDevices(group.getId()).add(device.getId()); } } |