diff options
author | Abyss777 <abyss@fox5.ru> | 2017-01-25 12:39:13 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-01-25 12:39:13 +0500 |
commit | 483ed4418f53c5207d7150bf288ec6245d8f2cc3 (patch) | |
tree | dcfa32f533fe1a6e1d508ccbfddfa77139831f7b /src/org/traccar/api/resource/DeviceResource.java | |
parent | 92f9691c9817526bd025377cb44aa336e7625592 (diff) | |
download | trackermap-server-483ed4418f53c5207d7150bf288ec6245d8f2cc3.tar.gz trackermap-server-483ed4418f53c5207d7150bf288ec6245d8f2cc3.tar.bz2 trackermap-server-483ed4418f53c5207d7150bf288ec6245d8f2cc3.zip |
- Add "deviceReadonly" user field
- Allow users edit tokens
- Managers can create users with deviceLimit = 0 only
- Manager can't create users with expirationTime later then their
- Other permissions improvements
Diffstat (limited to 'src/org/traccar/api/resource/DeviceResource.java')
-rw-r--r-- | src/org/traccar/api/resource/DeviceResource.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java index c9680ac77..e0c2335f9 100644 --- a/src/org/traccar/api/resource/DeviceResource.java +++ b/src/org/traccar/api/resource/DeviceResource.java @@ -62,6 +62,7 @@ public class DeviceResource extends BaseResource { @POST public Response add(Device entity) throws SQLException { Context.getPermissionsManager().checkReadonly(getUserId()); + Context.getPermissionsManager().checkDeviceReadonly(getUserId()); Context.getPermissionsManager().checkDeviceLimit(getUserId()); Context.getDeviceManager().addDevice(entity); Context.getDataManager().linkDevice(getUserId(), entity.getId()); @@ -76,6 +77,7 @@ public class DeviceResource extends BaseResource { @PUT public Response update(Device entity) throws SQLException { Context.getPermissionsManager().checkReadonly(getUserId()); + Context.getPermissionsManager().checkDeviceReadonly(getUserId()); Context.getPermissionsManager().checkDevice(getUserId(), entity.getId()); Context.getDeviceManager().updateDevice(entity); if (Context.getGeofenceManager() != null) { @@ -88,6 +90,7 @@ public class DeviceResource extends BaseResource { @DELETE public Response remove(@PathParam("id") long id) throws SQLException { Context.getPermissionsManager().checkReadonly(getUserId()); + Context.getPermissionsManager().checkDeviceReadonly(getUserId()); Context.getPermissionsManager().checkDevice(getUserId(), id); Context.getDeviceManager().removeDevice(id); Context.getPermissionsManager().refreshPermissions(); |