diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-01-25 23:32:21 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 23:32:21 +1300 |
| commit | b1453ebd231009e9d9078377f2a1e063d852c444 (patch) | |
| tree | 2699449567a46d6d182a41a4687f483047a59f77 /src/org/traccar/api/resource/DevicePermissionResource.java | |
| parent | 36c48d354cec2888df67b303352ee5ce9d23de3e (diff) | |
| parent | 483ed4418f53c5207d7150bf288ec6245d8f2cc3 (diff) | |
| download | trackermap-server-b1453ebd231009e9d9078377f2a1e063d852c444.tar.gz trackermap-server-b1453ebd231009e9d9078377f2a1e063d852c444.tar.bz2 trackermap-server-b1453ebd231009e9d9078377f2a1e063d852c444.zip | |
Merge pull request #2831 from Abyss777/permissions_polishing
Permissions improvements
Diffstat (limited to 'src/org/traccar/api/resource/DevicePermissionResource.java')
| -rw-r--r-- | src/org/traccar/api/resource/DevicePermissionResource.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/traccar/api/resource/DevicePermissionResource.java b/src/org/traccar/api/resource/DevicePermissionResource.java index af38676b0..6e00dc47f 100644 --- a/src/org/traccar/api/resource/DevicePermissionResource.java +++ b/src/org/traccar/api/resource/DevicePermissionResource.java @@ -38,9 +38,6 @@ public class DevicePermissionResource extends BaseResource { Context.getPermissionsManager().checkReadonly(getUserId()); Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId()); Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId()); - if (!Context.getPermissionsManager().isAdmin(getUserId())) { - Context.getPermissionsManager().checkDeviceLimit(entity.getUserId()); - } Context.getDataManager().linkDevice(entity.getUserId(), entity.getDeviceId()); Context.getPermissionsManager().refreshPermissions(); if (Context.getGeofenceManager() != null) { @@ -52,7 +49,11 @@ public class DevicePermissionResource extends BaseResource { @DELETE public Response remove(DevicePermission entity) throws SQLException { Context.getPermissionsManager().checkReadonly(getUserId()); - Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId()); + if (getUserId() != entity.getUserId()) { + Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId()); + } else { + Context.getPermissionsManager().checkAdmin(getUserId()); + } Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId()); Context.getDataManager().unlinkDevice(entity.getUserId(), entity.getDeviceId()); Context.getPermissionsManager().refreshPermissions(); |