diff options
| author | ninioe <ninioe@gmail.com> | 2016-07-21 07:58:28 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-07-21 07:58:28 +0300 |
| commit | 2e7987b5df7611299aa76bcc9eca3424ce31d204 (patch) | |
| tree | c7314d97562365d2cf1fa67f707ee0a250aa3b42 | |
| parent | 19d51272931f92c5c8a139e8aa8f9aa0314f6c61 (diff) | |
| download | trackermap-server-2e7987b5df7611299aa76bcc9eca3424ce31d204.tar.gz trackermap-server-2e7987b5df7611299aa76bcc9eca3424ce31d204.tar.bz2 trackermap-server-2e7987b5df7611299aa76bcc9eca3424ce31d204.zip | |
protect Device positionId on clear history
| -rw-r--r-- | debug.xml | 2 | ||||
| -rw-r--r-- | src/org/traccar/database/DataManager.java | 1 | ||||
| -rw-r--r-- | web/app/controller/Root.js | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -324,7 +324,7 @@ </entry> <entry key='database.clearPositionsHistory'> - DELETE FROM positions WHERE deviceid = :deviceId and servertime < :serverTime; + DELETE FROM positions WHERE id != :positionId and deviceid = :deviceId and servertime < :serverTime; </entry> <!-- PROTOCOL CONFIG --> diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 691c31643..710eceebb 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -416,6 +416,7 @@ public class DataManager { Date dateBefore = new Date(lastUpdate.getTime() - histDays * 24 * 3600 * 1000); QueryBuilder.create(dataSource, sql) + .setLong("positionId", device.getPositionId()) .setLong("deviceId", device.getId()) .setDate("serverTime", dateBefore) .executeUpdate(); diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 90923fe53..fd30fe7c9 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -81,7 +81,7 @@ Ext.define('Traccar.controller.Root', { this.asyncUpdate(true); } }); - Ext.get('attribution').remove(); + if (Ext.get('attribution') !== null) Ext.get('attribution').remove(); if (this.isPhone) { Ext.create('widget.mainMobile'); } else { |