diff options
author | Abyss777 <abyss@fox5.ru> | 2017-09-12 17:42:16 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-09-12 17:42:16 +0500 |
commit | 925806fe70e10e47bcc12eb8bcc4fe21a9ece220 (patch) | |
tree | a2972e4915f941699c6582b915c27189f28c63e4 /src/org/traccar/api/resource/CommandTypeResource.java | |
parent | 195e7b5b45c08fa4fad4f9c8797f8807ded1dbea (diff) | |
download | trackermap-server-925806fe70e10e47bcc12eb8bcc4fe21a9ece220.tar.gz trackermap-server-925806fe70e10e47bcc12eb8bcc4fe21a9ece220.tar.bz2 trackermap-server-925806fe70e10e47bcc12eb8bcc4fe21a9ece220.zip |
Implement Saved Commands
Diffstat (limited to 'src/org/traccar/api/resource/CommandTypeResource.java')
-rw-r--r-- | src/org/traccar/api/resource/CommandTypeResource.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/CommandTypeResource.java b/src/org/traccar/api/resource/CommandTypeResource.java index d5d220547..30f9300cb 100644 --- a/src/org/traccar/api/resource/CommandTypeResource.java +++ b/src/org/traccar/api/resource/CommandTypeResource.java @@ -36,8 +36,12 @@ public class CommandTypeResource extends BaseResource { @GET public Collection<CommandType> get(@QueryParam("deviceId") long deviceId, @QueryParam("textChannel") boolean textChannel) { - Context.getPermissionsManager().checkDevice(getUserId(), deviceId); - return Context.getDeviceManager().getCommandTypes(deviceId, textChannel); + if (deviceId != 0) { + Context.getPermissionsManager().checkDevice(getUserId(), deviceId); + return Context.getCommandsManager().getCommandTypes(deviceId, textChannel); + } else { + return Context.getCommandsManager().getAllCommandTypes(); + } } } |