aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-03-07 16:42:14 +1300
committerGitHub <noreply@github.com>2017-03-07 16:42:14 +1300
commit54867872a7e227742418037ce01da675587cd92b (patch)
treed85a3b1360d76223b64488575394517f7111ab13 /src/org/traccar/api
parentdc79a5ce6d9776db30d357dfb16dff624db770dd (diff)
parent679f838e8bd0caaea94b1d4d1cd9b740ea3b9606 (diff)
downloadtrackermap-server-54867872a7e227742418037ce01da675587cd92b.tar.gz
trackermap-server-54867872a7e227742418037ce01da675587cd92b.tar.bz2
trackermap-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.java5
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);
}
}