aboutsummaryrefslogtreecommitdiff
path: root/web/app/view
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-09-07 17:03:58 +0500
committerAbyss777 <abyss@fox5.ru>2017-09-07 17:03:58 +0500
commit591466507225d41c3ba3ae677aee5423c05e1aeb (patch)
tree5b884fb50dac2d94b0561f4cf4570a59fea710dc /web/app/view
parent911863f770557f474138f2b113054d5bb294daf8 (diff)
downloadetbsa-traccar-web-591466507225d41c3ba3ae677aee5423c05e1aeb.tar.gz
etbsa-traccar-web-591466507225d41c3ba3ae677aee5423c05e1aeb.tar.bz2
etbsa-traccar-web-591466507225d41c3ba3ae677aee5423c05e1aeb.zip
Fix units migration
Diffstat (limited to 'web/app/view')
-rw-r--r--web/app/view/CustomNumberField.js4
-rw-r--r--web/app/view/edit/Attributes.js4
-rw-r--r--web/app/view/map/BaseMap.js2
3 files changed, 5 insertions, 5 deletions
diff --git a/web/app/view/CustomNumberField.js b/web/app/view/CustomNumberField.js
index e8fe5f7..807bad4 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 a76223b..2dd06be 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 0559e0c..30ac23e 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'