diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-02-13 21:48:44 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 21:48:44 +1300 |
| commit | 66171b939e4d20ecae0014bb61862e1880e9c6c5 (patch) | |
| tree | 4e2f4953ab56070225e93e0c2e2497514a45f94f /web | |
| parent | 1db0f3fce321a6f22da47998a53f6a5bf7bc7b36 (diff) | |
| parent | 12684a1284721b83e189d93969e00eb8b8564448 (diff) | |
| download | etbsa-traccar-web-66171b939e4d20ecae0014bb61862e1880e9c6c5.tar.gz etbsa-traccar-web-66171b939e4d20ecae0014bb61862e1880e9c6c5.tar.bz2 etbsa-traccar-web-66171b939e4d20ecae0014bb61862e1880e9c6c5.zip | |
Merge pull request #407 from Abyss777/fix_405
Use more efficient method to lookup store (fix #405)
Diffstat (limited to 'web')
| -rw-r--r-- | web/app/view/MapMarkerController.js | 6 | ||||
| -rw-r--r-- | web/app/view/ReportController.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/web/app/view/MapMarkerController.js b/web/app/view/MapMarkerController.js index 3951755..27591c1 100644 --- a/web/app/view/MapMarkerController.js +++ b/web/app/view/MapMarkerController.js @@ -171,7 +171,7 @@ Ext.define('Traccar.view.MapMarkerController', { for (i = 0; i < data.length; i++) { position = data[i]; - device = Ext.getStore('Devices').findRecord('id', position.get('deviceId'), 0, false, false, true); + device = Ext.getStore('Devices').getById(position.get('deviceId')); if (device) { this.updateAccuracy(position); @@ -333,9 +333,9 @@ Ext.define('Traccar.view.MapMarkerController', { } } if (minx !== maxx || miny !== maxy) { - this.getView().getMapView().fit([minx, miny, maxx, maxy], this.getView().getMap().getSize()); + this.getView().getMapView().fit([minx, miny, maxx, maxy]); } else if (point) { - this.getView().getMapView().fit(new ol.geom.Point(point), this.getView().getMap().getSize()); + this.getView().getMapView().fit(new ol.geom.Point(point)); } }, diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index d53abed..9decb65 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -437,7 +437,7 @@ Ext.define('Traccar.view.ReportController', { dataIndex: 'geofenceId', renderer: function (value) { if (value !== 0) { - return Ext.getStore('Geofences').findRecord('id', value).get('name'); + return Ext.getStore('Geofences').getById(value).get('name'); } } }], |