diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-20 22:05:49 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 22:05:49 +1200 |
| commit | 9a4bd28bec0cdb05a39e1f66be7df7a287f98a80 (patch) | |
| tree | 89fb17d5ac9a8d703869e0b8ee5351062ae77cc5 /web/app/view/dialog | |
| parent | 5d35a71af8642dc23cc230efc7d3fca8705efe13 (diff) | |
| parent | 2c4c52a8d925de24c004db7ec01479c27e507f1d (diff) | |
| download | trackermap-web-9a4bd28bec0cdb05a39e1f66be7df7a287f98a80.tar.gz trackermap-web-9a4bd28bec0cdb05a39e1f66be7df7a287f98a80.tar.bz2 trackermap-web-9a4bd28bec0cdb05a39e1f66be7df7a287f98a80.zip | |
Merge pull request #470 from Abyss777/known_attribute_conversion
Convert speed and distance for known attributes
Diffstat (limited to 'web/app/view/dialog')
| -rw-r--r-- | web/app/view/dialog/Attribute.js | 3 | ||||
| -rw-r--r-- | web/app/view/dialog/AttributeController.js | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/web/app/view/dialog/Attribute.js b/web/app/view/dialog/Attribute.js index 6614c87f..2a458977 100644 --- a/web/app/view/dialog/Attribute.js +++ b/web/app/view/dialog/Attribute.js @@ -20,7 +20,8 @@ Ext.define('Traccar.view.dialog.Attribute', { requires: [ 'Traccar.view.dialog.AttributeController', - 'Traccar.view.ColorPicker' + 'Traccar.view.ColorPicker', + 'Traccar.view.CustomNumberField' ], controller: 'attribute', diff --git a/web/app/view/dialog/AttributeController.js b/web/app/view/dialog/AttributeController.js index da5205b4..afa970ad 100644 --- a/web/app/view/dialog/AttributeController.js +++ b/web/app/view/dialog/AttributeController.js @@ -59,12 +59,13 @@ Ext.define('Traccar.view.dialog.AttributeController', { type = attribute.get('type'); config = Ext.clone(this.defaultFieldConfig); if (type === 'number') { - config.xtype = 'numberfield'; + config.xtype = 'customNumberField'; if (attribute.get('allowDecimals') !== undefined) { config.allowDecimals = attribute.get('allowDecimals'); } else { config.allowDecimals = true; } + config.convert = attribute.get('convert'); config.maxValue = attribute.get('maxValue'); config.minValue = attribute.get('minValue'); } else if (type === 'boolean') { @@ -76,7 +77,7 @@ Ext.define('Traccar.view.dialog.AttributeController', { } else { config.xtype = 'textfield'; } - if (valueField.getXType() !== config.xtype) { + if (valueField.getXType() !== config.xtype || valueField.convert !== config.convert) { this.getView().down('form').insert(this.getView().down('form').items.indexOf(valueField), config); this.getView().down('form').remove(valueField); } else if (config.xtype === 'numberfield') { |