aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource/CommandResource.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-10-23 19:16:28 +1300
committerGitHub <noreply@github.com>2017-10-23 19:16:28 +1300
commit496f6a612eb02396946db2715225f55cc7003a0d (patch)
tree8028751cd713e90c1b1a35eab4027dda9280959d /src/org/traccar/api/resource/CommandResource.java
parentf6f514bea19a75544378fdbfccb6808ea1a0424e (diff)
parent22efd02c8a45963e08e887d402bd4b9161636ddf (diff)
downloadtrackermap-server-496f6a612eb02396946db2715225f55cc7003a0d.tar.gz
trackermap-server-496f6a612eb02396946db2715225f55cc7003a0d.tar.bz2
trackermap-server-496f6a612eb02396946db2715225f55cc7003a0d.zip
Merge pull request #3600 from Abyss777/fix_3592
Set deviceId in Saved Command before sending
Diffstat (limited to 'src/org/traccar/api/resource/CommandResource.java')
-rw-r--r--src/org/traccar/api/resource/CommandResource.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/org/traccar/api/resource/CommandResource.java b/src/org/traccar/api/resource/CommandResource.java
index 996c15daf..703638701 100644
--- a/src/org/traccar/api/resource/CommandResource.java
+++ b/src/org/traccar/api/resource/CommandResource.java
@@ -62,18 +62,14 @@ public class CommandResource extends ExtendedObjectResource<Command> {
Context.getPermissionsManager().checkReadonly(getUserId());
long deviceId = entity.getDeviceId();
long id = entity.getId();
- boolean sent;
- if (deviceId != 0 && id != 0) {
+ Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
+ if (id != 0) {
Context.getPermissionsManager().checkPermission(Command.class, getUserId(), id);
- Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
Context.getPermissionsManager().checkUserDeviceCommand(getUserId(), deviceId, id);
- sent = Context.getCommandsManager().sendCommand(id, deviceId);
} else {
Context.getPermissionsManager().checkLimitCommands(getUserId());
- Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
- sent = Context.getCommandsManager().sendCommand(entity, deviceId);
}
- if (!sent) {
+ if (!Context.getCommandsManager().sendCommand(entity)) {
return Response.accepted(entity).build();
}
return Response.ok(entity).build();