diff options
| author | ninioe <ninioe@gmail.com> | 2016-07-19 09:07:23 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-07-19 09:07:23 +0300 |
| commit | ef40f3317392068692606b484c6782b95b554cbf (patch) | |
| tree | 41c48e6c87620a6444aed0ad5706a94e26b1662d /src/org/traccar/database/PermissionsManager.java | |
| parent | 04627d7473e4ea21d6ecd950cbb3fdd6fa249429 (diff) | |
| parent | d3e063cf9de8a45bed4dfe87b73aadfd8d2edeab (diff) | |
| download | traccar-server-ef40f3317392068692606b484c6782b95b554cbf.tar.gz traccar-server-ef40f3317392068692606b484c6782b95b554cbf.tar.bz2 traccar-server-ef40f3317392068692606b484c6782b95b554cbf.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
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()); |