aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-07-12 00:55:01 +1200
committerGitHub <noreply@github.com>2017-07-12 00:55:01 +1200
commitbdf451b3e4ecf0746dffed44ce0f973e06ac0f22 (patch)
treea8ab02475371a57644456e8b82429365e93998a4 /src/org/traccar
parent85f7eae47ec4bf6b269305a05a696f9acce31fd5 (diff)
parent24a0a43d58088eb569ba0d7c32bc8a2d31a13d53 (diff)
downloadtraccar-server-bdf451b3e4ecf0746dffed44ce0f973e06ac0f22.tar.gz
traccar-server-bdf451b3e4ecf0746dffed44ce0f973e06ac0f22.tar.bz2
traccar-server-bdf451b3e4ecf0746dffed44ce0f973e06ac0f22.zip
Merge pull request #3341 from Abyss777/fix_attribute_unlink
Fix Device and Group Computed Attribute unlinking
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/api/resource/DeviceAttributeResource.java2
-rw-r--r--src/org/traccar/api/resource/GroupAttributeResource.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/DeviceAttributeResource.java b/src/org/traccar/api/resource/DeviceAttributeResource.java
index 8d80c9235..82d17bcc6 100644
--- a/src/org/traccar/api/resource/DeviceAttributeResource.java
+++ b/src/org/traccar/api/resource/DeviceAttributeResource.java
@@ -49,7 +49,7 @@ public class DeviceAttributeResource extends BaseResource {
public Response remove(DeviceAttribute entity) throws SQLException {
Context.getPermissionsManager().checkReadonly(getUserId());
Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
- Context.getPermissionsManager().checkGeofence(getUserId(), entity.getAttributeId());
+ Context.getPermissionsManager().checkAttribute(getUserId(), entity.getAttributeId());
Context.getDataManager().unlinkDeviceAttribute(entity.getDeviceId(), entity.getAttributeId());
Context.getAttributesManager().refresh();
return Response.noContent().build();
diff --git a/src/org/traccar/api/resource/GroupAttributeResource.java b/src/org/traccar/api/resource/GroupAttributeResource.java
index 84b876d34..d8b8b58c9 100644
--- a/src/org/traccar/api/resource/GroupAttributeResource.java
+++ b/src/org/traccar/api/resource/GroupAttributeResource.java
@@ -49,7 +49,7 @@ public class GroupAttributeResource extends BaseResource {
public Response remove(GroupAttribute entity) throws SQLException {
Context.getPermissionsManager().checkReadonly(getUserId());
Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
- Context.getPermissionsManager().checkGeofence(getUserId(), entity.getAttributeId());
+ Context.getPermissionsManager().checkAttribute(getUserId(), entity.getAttributeId());
Context.getDataManager().unlinkGroupAttribute(entity.getGroupId(), entity.getAttributeId());
Context.getAttributesManager().refresh();
return Response.noContent().build();