aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorparveenkumaryadav <parveenkumardeeva@gmail.com>2018-01-10 16:17:25 +0530
committerparveenkumaryadav <parveenkumardeeva@gmail.com>2018-01-10 16:17:25 +0530
commit6428e67fe7732d15adcf27ffd261e3eda96840cd (patch)
treec58269dbcb12378f56875379d24b356b7e96ab12 /src/org
parent8dad0208975bf29e868a5ca9b6a844863f50d86c (diff)
downloadtraccar-server-6428e67fe7732d15adcf27ffd261e3eda96840cd.tar.gz
traccar-server-6428e67fe7732d15adcf27ffd261e3eda96840cd.tar.bz2
traccar-server-6428e67fe7732d15adcf27ffd261e3eda96840cd.zip
Remove Odometer permission to User bug fix
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/api/resource/DeviceResource.java2
-rw-r--r--src/org/traccar/database/PermissionsManager.java8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index c432a04f4..c04b3b474 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -88,7 +88,7 @@ public class DeviceResource extends BaseObjectResource<Device> {
@Path("{id}/distance")
@PUT
public Response updateTotalDistance(DeviceTotalDistance entity) throws SQLException {
- Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
+ Context.getPermissionsManager().checkDeviceManagerOrAdmin(getUserId(), entity.getDeviceId());
Context.getDeviceManager().resetTotalDistance(entity);
LogAction.resetTotalDistance(getUserId(), entity.getDeviceId());
return Response.noContent().build();
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index 60bda99ce..05806175c 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -300,7 +300,13 @@ public class PermissionsManager {
}
public void checkDevice(long userId, long deviceId) throws SecurityException {
- if (!Context.getDeviceManager().getUserItems(userId).contains(deviceId) && !getUserAdmin(userId)) {
+ if (!Context.getDeviceManager().getUserItems(userId).contains(deviceId)) {
+ checkDeviceManagerOrAdmin(userId, deviceId);
+ }
+ }
+
+ public void checkDeviceManagerOrAdmin(long userId, long deviceId) throws SecurityException {
+ if (!getUserAdmin(userId)) {
checkManager(userId);
for (long managedUserId : usersManager.getUserItems(userId)) {
if (Context.getDeviceManager().getUserItems(managedUserId).contains(deviceId)) {