aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource/GeofenceResource.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-01-13 09:26:52 +0500
committerAbyss777 <abyss@fox5.ru>2017-01-16 13:44:54 +0500
commitcffbce4b3bc5ef817c4063a74f148a2a5986d58a (patch)
tree3eb18f009ec1a7ae5d806eed1a4af7b6a16840e2 /src/org/traccar/api/resource/GeofenceResource.java
parent3533a7c9007c4ef4f761ff4d959e396b65a7b140 (diff)
downloadtrackermap-server-cffbce4b3bc5ef817c4063a74f148a2a5986d58a.tar.gz
trackermap-server-cffbce4b3bc5ef817c4063a74f148a2a5986d58a.tar.bz2
trackermap-server-cffbce4b3bc5ef817c4063a74f148a2a5986d58a.zip
Initial manager implementation
Diffstat (limited to 'src/org/traccar/api/resource/GeofenceResource.java')
-rw-r--r--src/org/traccar/api/resource/GeofenceResource.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java
index 591908813..5f085023a 100644
--- a/src/org/traccar/api/resource/GeofenceResource.java
+++ b/src/org/traccar/api/resource/GeofenceResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,8 +54,12 @@ public class GeofenceResource extends BaseResource {
Set<Long> result;
if (all) {
- Context.getPermissionsManager().checkAdmin(getUserId());
- result = new HashSet<>(geofenceManager.getAllGeofencesIds());
+ if (Context.getPermissionsManager().isAdmin(getUserId())) {
+ result = new HashSet<>(geofenceManager.getAllGeofencesIds());
+ } else {
+ Context.getPermissionsManager().checkManager(getUserId());
+ result = new HashSet<>(geofenceManager.getManagedGeofencesIds(getUserId()));
+ }
} else {
if (userId == 0) {
userId = getUserId();