diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-07 16:42:14 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-07 16:42:14 +1300 |
commit | 54867872a7e227742418037ce01da675587cd92b (patch) | |
tree | d85a3b1360d76223b64488575394517f7111ab13 /src/org/traccar/api | |
parent | dc79a5ce6d9776db30d357dfb16dff624db770dd (diff) | |
parent | 679f838e8bd0caaea94b1d4d1cd9b740ea3b9606 (diff) | |
download | traccar-server-54867872a7e227742418037ce01da675587cd92b.tar.gz traccar-server-54867872a7e227742418037ce01da675587cd92b.tar.bz2 traccar-server-54867872a7e227742418037ce01da675587cd92b.zip |
Merge pull request #2982 from Abyss777/rename_data_and_text
Introduce terms "data" and "text" commands
Diffstat (limited to 'src/org/traccar/api')
-rw-r--r-- | src/org/traccar/api/resource/CommandTypeResource.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/CommandTypeResource.java b/src/org/traccar/api/resource/CommandTypeResource.java index 3ee773fbf..d5d220547 100644 --- a/src/org/traccar/api/resource/CommandTypeResource.java +++ b/src/org/traccar/api/resource/CommandTypeResource.java @@ -34,9 +34,10 @@ import java.util.Collection; public class CommandTypeResource extends BaseResource { @GET - public Collection<CommandType> get(@QueryParam("deviceId") long deviceId, @QueryParam("sms") boolean sms) { + public Collection<CommandType> get(@QueryParam("deviceId") long deviceId, + @QueryParam("textChannel") boolean textChannel) { Context.getPermissionsManager().checkDevice(getUserId(), deviceId); - return Context.getDeviceManager().getCommandTypes(deviceId, sms); + return Context.getDeviceManager().getCommandTypes(deviceId, textChannel); } } |