diff options
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 6614c87..2a45897 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 da5205b..afa970a 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') { |