diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-09-19 22:10:44 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 22:10:44 +1200 |
| commit | 6a40551d0e1d63fbb68f0401be73a4c64db4ca64 (patch) | |
| tree | 36e5d835966f0a7d1d5563e24263b87734c86370 /src/org/traccar/api/resource/CommandTypeResource.java | |
| parent | 561c616418918da4bb1d75c95347e25c23f72f6a (diff) | |
| parent | 285f6feea43be782edc6233b709d47b146250361 (diff) | |
| download | traccar-server-6a40551d0e1d63fbb68f0401be73a4c64db4ca64.tar.gz traccar-server-6a40551d0e1d63fbb68f0401be73a4c64db4ca64.tar.bz2 traccar-server-6a40551d0e1d63fbb68f0401be73a4c64db4ca64.zip | |
Merge pull request #3534 from Abyss777/extend_notifications
Implement per device Notifications
Diffstat (limited to 'src/org/traccar/api/resource/CommandTypeResource.java')
| -rw-r--r-- | src/org/traccar/api/resource/CommandTypeResource.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/CommandTypeResource.java b/src/org/traccar/api/resource/CommandTypeResource.java index 30f9300cb..0a904bd8a 100644 --- a/src/org/traccar/api/resource/CommandTypeResource.java +++ b/src/org/traccar/api/resource/CommandTypeResource.java @@ -18,7 +18,7 @@ package org.traccar.api.resource; import org.traccar.Context; import org.traccar.api.BaseResource; -import org.traccar.model.CommandType; +import org.traccar.model.Typed; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -34,7 +34,7 @@ import java.util.Collection; public class CommandTypeResource extends BaseResource { @GET - public Collection<CommandType> get(@QueryParam("deviceId") long deviceId, + public Collection<Typed> get(@QueryParam("deviceId") long deviceId, @QueryParam("textChannel") boolean textChannel) { if (deviceId != 0) { Context.getPermissionsManager().checkDevice(getUserId(), deviceId); |