From cffbce4b3bc5ef817c4063a74f148a2a5986d58a Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 13 Jan 2017 09:26:52 +0500 Subject: Initial manager implementation --- src/org/traccar/api/resource/GeofenceResource.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/api/resource/GeofenceResource.java') 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 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(); -- cgit v1.2.3