diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-04-20 20:21:38 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 20:21:38 +1200 |
| commit | 957a6544c4d5a44d52f821377b97ee2205bb22a2 (patch) | |
| tree | 9ca8487766cc7789435f0b782b41b1b29dee405e /web/app/view/edit/Attributes.js | |
| parent | 4e7d2b8fdb41390205d69997d61db536545f5564 (diff) | |
| parent | 5ad9dc859216a129da6f352b13b908d08ec983a2 (diff) | |
| download | etbsa-traccar-web-957a6544c4d5a44d52f821377b97ee2205bb22a2.tar.gz etbsa-traccar-web-957a6544c4d5a44d52f821377b97ee2205bb22a2.tar.bz2 etbsa-traccar-web-957a6544c4d5a44d52f821377b97ee2205bb22a2.zip | |
Merge pull request #665 from Abyss777/multi_maintenance
Implement Maintenances
Diffstat (limited to 'web/app/view/edit/Attributes.js')
| -rw-r--r-- | web/app/view/edit/Attributes.js | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/web/app/view/edit/Attributes.js b/web/app/view/edit/Attributes.js index cb07eda..af4f5a9 100644 --- a/web/app/view/edit/Attributes.js +++ b/web/app/view/edit/Attributes.js @@ -48,7 +48,7 @@ Ext.define('Traccar.view.edit.Attributes', { if (this.attributesStore) { attribute = Ext.getStore(this.attributesStore).getById(value); } - return attribute && attribute.get('name') ? attribute.get('name') : value; + return attribute && attribute.get('name') || value; } }, { text: Strings.stateValue, @@ -58,13 +58,7 @@ Ext.define('Traccar.view.edit.Attributes', { if (this.attributesStore) { attribute = Ext.getStore(this.attributesStore).getById(record.get('name')); } - if (attribute && attribute.get('dataType') === 'speed') { - 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.getAttributePreference('distanceUnit', 'km'), true); - } else { - return value; - } + return Traccar.AttributeFormatter.renderAttribute(value, attribute); } }] } |