diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-09-13 22:15:49 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 22:15:49 +1200 |
| commit | 8a45a056b7e0814526904e915c3886b29ba2833a (patch) | |
| tree | dc821e2134f4ae2c9881ce8de006a29b33da289f /src/org/traccar/api/resource/CommandTypeResource.java | |
| parent | e05f0b83a911c522123a5a2cd14d6c16bd2de027 (diff) | |
| parent | 7530522cbca477cb822cb494ffe12480e5237934 (diff) | |
| download | trackermap-server-8a45a056b7e0814526904e915c3886b29ba2833a.tar.gz trackermap-server-8a45a056b7e0814526904e915c3886b29ba2833a.tar.bz2 trackermap-server-8a45a056b7e0814526904e915c3886b29ba2833a.zip | |
Merge pull request #3522 from Abyss777/saved_commands
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(); + } } } |