aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database/SimpleObjectManager.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-07-25 18:59:29 +1200
committerGitHub <noreply@github.com>2017-07-25 18:59:29 +1200
commit234223a179d3f5e390cf8a649158676f8c349e5c (patch)
treee40066f50ead2270bda27fd9ce2cbf4a702c09fd /src/org/traccar/database/SimpleObjectManager.java
parent6253fa291c3a2962fef2076c0cbb0f4e1ca8a3b4 (diff)
parent68af658ea2ff9593e5be7a2b2cfcb75c744fd749 (diff)
downloadtraccar-server-234223a179d3f5e390cf8a649158676f8c349e5c.tar.gz
traccar-server-234223a179d3f5e390cf8a649158676f8c349e5c.tar.bz2
traccar-server-234223a179d3f5e390cf8a649158676f8c349e5c.zip
Merge pull request #3388 from Abyss777/optimize_users
Move users management to separate manager
Diffstat (limited to 'src/org/traccar/database/SimpleObjectManager.java')
-rw-r--r--src/org/traccar/database/SimpleObjectManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/database/SimpleObjectManager.java b/src/org/traccar/database/SimpleObjectManager.java
index 282dea46e..124178a05 100644
--- a/src/org/traccar/database/SimpleObjectManager.java
+++ b/src/org/traccar/database/SimpleObjectManager.java
@@ -166,10 +166,10 @@ public abstract class SimpleObjectManager {
return items.keySet();
}
- public final Set<Long> getManagedItems(long userId) {
+ public Set<Long> getManagedItems(long userId) {
Set<Long> result = new HashSet<>();
result.addAll(getUserItems(userId));
- for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
+ for (long managedUserId : Context.getUsersManager().getManagedItems(userId)) {
result.addAll(getUserItems(managedUserId));
}
return result;