diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-07-16 12:33:32 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-16 12:33:32 +1200 |
| commit | 6aa4a84c9ef97f5d7980e71cf524a445e87de714 (patch) | |
| tree | a3e90f40f0c42cc59a6654965ff3dcf37d8d99cb /src/org/traccar/database/PermissionsManager.java | |
| parent | 6fefd48ab48a2382a9a7bc07e168b48a1ce8bc40 (diff) | |
| parent | d71210f1f408c757d4fe3da07829bbc3362a7e93 (diff) | |
| download | trackermap-server-6aa4a84c9ef97f5d7980e71cf524a445e87de714.tar.gz trackermap-server-6aa4a84c9ef97f5d7980e71cf524a445e87de714.tar.bz2 trackermap-server-6aa4a84c9ef97f5d7980e71cf524a445e87de714.zip | |
Merge pull request #2116 from Abyss777/device_manager_final
Move code related to devices to DeviceManager
Diffstat (limited to 'src/org/traccar/database/PermissionsManager.java')
| -rw-r--r-- | src/org/traccar/database/PermissionsManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java index b6dd2e2a9..5a15375b4 100644 --- a/src/org/traccar/database/PermissionsManager.java +++ b/src/org/traccar/database/PermissionsManager.java @@ -78,7 +78,7 @@ public class PermissionsManager { users.put(user.getId(), user); } - GroupTree groupTree = new GroupTree(dataManager.getAllGroups(), dataManager.getAllDevicesCached()); + GroupTree groupTree = new GroupTree(dataManager.getAllGroups(), Context.getDeviceManager().getAllDevices()); for (GroupPermission permission : dataManager.getGroupPermissions()) { Set<Long> userGroupPermissions = getGroupPermissions(permission.getUserId()); Set<Long> userDevicePermissions = getDevicePermissions(permission.getUserId()); |