diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-01-29 19:19:35 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 19:19:35 +1300 |
| commit | ce1212355723b342106f9b97a1ac15fd3c344621 (patch) | |
| tree | 99015fa150d4a4a4a4560d9857c4ad511bf80065 /src/org/traccar/model/Device.java | |
| parent | 98f14df734f2772d65c28ab4364e37f16efabbad (diff) | |
| parent | 400a82e0c1817f02fcc2b0cf3ffe6f8ee5abf05f (diff) | |
| download | traccar-server-ce1212355723b342106f9b97a1ac15fd3c344621.tar.gz traccar-server-ce1212355723b342106f9b97a1ac15fd3c344621.tar.bz2 traccar-server-ce1212355723b342106f9b97a1ac15fd3c344621.zip | |
Merge pull request #3741 from Abyss777/fix_scheduled
Fix ScheduledModel objects permission check
Diffstat (limited to 'src/org/traccar/model/Device.java')
| -rw-r--r-- | src/org/traccar/model/Device.java | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java index 51b479b09..0c9be932d 100644 --- a/src/org/traccar/model/Device.java +++ b/src/org/traccar/model/Device.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2012 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import java.util.List; import org.traccar.database.QueryExtended; import org.traccar.database.QueryIgnore; -public class Device extends ExtendedModel { +public class Device extends GroupedModel { private String name; @@ -88,16 +88,6 @@ public class Device extends ExtendedModel { this.positionId = positionId; } - private long groupId; - - public long getGroupId() { - return groupId; - } - - public void setGroupId(long groupId) { - this.groupId = groupId; - } - private List<Long> geofenceIds; @QueryIgnore |