aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource/PermissionsResource.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-12-19 20:41:09 +1300
committerGitHub <noreply@github.com>2017-12-19 20:41:09 +1300
commitf9b786398acee9f73e8591f7b0967be280524045 (patch)
tree10d544c07400ba89741a275bc1a26182689bad07 /src/org/traccar/api/resource/PermissionsResource.java
parent8162c8ea169a39d247747e1731fe713102e6f3cc (diff)
parent7858975ecb7d78106ad6dec829b838073d0db098 (diff)
downloadtrackermap-server-f9b786398acee9f73e8591f7b0967be280524045.tar.gz
trackermap-server-f9b786398acee9f73e8591f7b0967be280524045.tar.bz2
trackermap-server-f9b786398acee9f73e8591f7b0967be280524045.zip
Merge pull request #3685 from Abyss777/log_actions
Log user actions
Diffstat (limited to 'src/org/traccar/api/resource/PermissionsResource.java')
-rw-r--r--src/org/traccar/api/resource/PermissionsResource.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/org/traccar/api/resource/PermissionsResource.java b/src/org/traccar/api/resource/PermissionsResource.java
index 9b9f65ad1..b89d9d376 100644
--- a/src/org/traccar/api/resource/PermissionsResource.java
+++ b/src/org/traccar/api/resource/PermissionsResource.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.Response;
import org.traccar.Context;
import org.traccar.api.BaseResource;
+import org.traccar.helper.LogAction;
import org.traccar.model.Device;
import org.traccar.model.Permission;
import org.traccar.model.User;
@@ -61,6 +62,8 @@ public class PermissionsResource extends BaseResource {
checkPermission(permission, true);
Context.getDataManager().linkObject(permission.getOwnerClass(), permission.getOwnerId(),
permission.getPropertyClass(), permission.getPropertyId(), true);
+ LogAction.link(getUserId(), permission.getOwnerClass(), permission.getOwnerId(),
+ permission.getPropertyClass(), permission.getPropertyId());
Context.getPermissionsManager().refreshPermissions(permission);
return Response.noContent().build();
}
@@ -72,6 +75,8 @@ public class PermissionsResource extends BaseResource {
checkPermission(permission, false);
Context.getDataManager().linkObject(permission.getOwnerClass(), permission.getOwnerId(),
permission.getPropertyClass(), permission.getPropertyId(), false);
+ LogAction.unlink(getUserId(), permission.getOwnerClass(), permission.getOwnerId(),
+ permission.getPropertyClass(), permission.getPropertyId());
Context.getPermissionsManager().refreshPermissions(permission);
return Response.noContent().build();
}