diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-09-08 00:34:51 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 00:34:51 +1200 |
| commit | 55747a648681224ccaa22ee52c437bbabc0bdbe3 (patch) | |
| tree | 5b884fb50dac2d94b0561f4cf4570a59fea710dc /web | |
| parent | 911863f770557f474138f2b113054d5bb294daf8 (diff) | |
| parent | 591466507225d41c3ba3ae677aee5423c05e1aeb (diff) | |
| download | trackermap-web-55747a648681224ccaa22ee52c437bbabc0bdbe3.tar.gz trackermap-web-55747a648681224ccaa22ee52c437bbabc0bdbe3.tar.bz2 trackermap-web-55747a648681224ccaa22ee52c437bbabc0bdbe3.zip | |
Merge pull request #575 from Abyss777/fix_units_migration
Fix units migration
Diffstat (limited to 'web')
| -rw-r--r-- | web/app/view/CustomNumberField.js | 4 | ||||
| -rw-r--r-- | web/app/view/edit/Attributes.js | 4 | ||||
| -rw-r--r-- | web/app/view/map/BaseMap.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/web/app/view/CustomNumberField.js b/web/app/view/CustomNumberField.js index e8fe5f79..807bad4d 100644 --- a/web/app/view/CustomNumberField.js +++ b/web/app/view/CustomNumberField.js @@ -33,7 +33,7 @@ Ext.define('Traccar.view.CustomNumberField', { return Ext.getStore('SpeedUnits'); }; config.units.getValue = function () { - return Traccar.app.getPreference('speedUnit', 'kn'); + return Traccar.app.getAttributePreference('speedUnit', 'kn'); }; unitName = Ext.getStore('SpeedUnits').findRecord('key', config.units.getValue()).get('name'); break; @@ -43,7 +43,7 @@ Ext.define('Traccar.view.CustomNumberField', { return Ext.getStore('DistanceUnits'); }; config.units.getValue = function () { - return Traccar.app.getPreference('distanceUnit', 'km'); + return Traccar.app.getAttributePreference('distanceUnit', 'km'); }; unitName = Ext.getStore('DistanceUnits').findRecord('key', config.units.getValue()).get('name'); break; diff --git a/web/app/view/edit/Attributes.js b/web/app/view/edit/Attributes.js index a76223b9..2dd06be2 100644 --- a/web/app/view/edit/Attributes.js +++ b/web/app/view/edit/Attributes.js @@ -62,9 +62,9 @@ Ext.define('Traccar.view.edit.Attributes', { attribute = Ext.getStore(this.attributesStore).getById(record.get('name')); } if (attribute && attribute.get('dataType') === 'speed') { - return Ext.getStore('SpeedUnits').formatValue(value, Traccar.app.getPreference('speedUnit', 'kn'), true); + return Ext.getStore('SpeedUnits').formatValue(value, Traccar.app.getAttributePreference('speedUnit', 'kn'), true); } else if (attribute && attribute.get('dataType') === 'distance') { - return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit', 'km'), true); + return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getAttributePreference('distanceUnit', 'km'), true); } else { return value; } diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js index 0559e0c9..30ac23eb 100644 --- a/web/app/view/map/BaseMap.js +++ b/web/app/view/map/BaseMap.js @@ -175,7 +175,7 @@ Ext.define('Traccar.view.map.BaseMap', { view: this.mapView }); - switch (Traccar.app.getPreference('distanceUnit', 'km')) { + switch (Traccar.app.getAttributePreference('distanceUnit', 'km')) { case 'mi': this.map.addControl(new ol.control.ScaleLine({ units: 'us' |