- Removed code duplication

- Simplified attribute name renderer
- Removed unnecessary proxy

5 files changed, 20 insertions, 26 deletions

diff --git a/web/app/store/MaintenanceTypes.js b/web/app/store/MaintenanceTypes.js
index 45b89a28..468b67ea 100644
--- a/web/app/store/MaintenanceTypes.js
+++ b/web/app/store/MaintenanceTypes.js
@@ -18,6 +18,5 @@
 
 Ext.define('Traccar.store.MaintenanceTypes', {
     extend: 'Ext.data.Store',
-    model: 'Traccar.model.KnownAttribute',
-    proxy: 'memory'
+    model: 'Traccar.model.KnownAttribute'
 });
diff --git a/web/app/view/dialog/MaintenanceController.js b/web/app/view/dialog/MaintenanceController.js
index 9efcec1f..d5a27b54 100644
--- a/web/app/view/dialog/MaintenanceController.js
+++ b/web/app/view/dialog/MaintenanceController.js
@@ -32,8 +32,21 @@ Ext.define('Traccar.view.dialog.MaintenanceController', {
         this.lookupReference('saveButton').setDisabled(!valid);
     },
 
+    updateFieldConfig: function (fieldReference, initialConfig, newConfig) {
+        var field = this.lookupReference(fieldReference);
+        if (field.dataType !== newConfig.dataType) {
+            this.getView().down('fieldset').insert(this.getView().down('fieldset').items.indexOf(field),
+                Ext.merge({}, initialConfig, newConfig));
+            this.getView().down('fieldset').remove(field);
+            this.lookupReference(fieldReference).validate();
+        } else {
+            field.setConfig(newConfig);
+            field.validate();
+        }
+    },
+
     onNameChange: function (combobox, newValue) {
-        var attribute, startField, periodField, config = {};
+        var attribute, config = {};
         attribute = combobox.getStore().getById(newValue);
         if (attribute) {
             if (attribute.get('allowDecimals') !== undefined) {
@@ -45,26 +58,8 @@ Ext.define('Traccar.view.dialog.MaintenanceController', {
             config.maxValue = attribute.get('maxValue');
             config.minValue = attribute.get('minValue');
         }
-        startField = this.lookupReference('startField');
-        if (startField.dataType !== config.dataType) {
-            this.getView().down('fieldset').insert(this.getView().down('fieldset').items.indexOf(startField),
-                Ext.merge({}, this.startConfig, config));
-            this.getView().down('fieldset').remove(startField);
-            this.lookupReference('startField').validate();
-        } else {
-            startField.setConfig(config);
-            startField.validate();
-        }
 
-        periodField = this.lookupReference('periodField');
-        if (periodField.dataType !== config.dataType) {
-            this.getView().down('fieldset').insert(this.getView().down('fieldset').items.indexOf(periodField),
-                Ext.merge({}, this.periodConfig, config));
-            this.getView().down('fieldset').remove(periodField);
-            this.lookupReference('periodField').validate();
-        } else {
-            periodField.setConfig(config);
-            periodField.validate();
-        }
+        this.updateFieldConfig('startField', this.startConfig, config);
+        this.updateFieldConfig('periodField', this.periodConfig, config);
     }
 });
diff --git a/web/app/view/edit/Attributes.js b/web/app/view/edit/Attributes.js
index cb0503de..af4f5a90 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,
diff --git a/web/app/view/edit/Maintenances.js b/web/app/view/edit/Maintenances.js
index f7b47620..da129154 100644
--- a/web/app/view/edit/Maintenances.js
+++ b/web/app/view/edit/Maintenances.js
@@ -56,7 +56,7 @@ Ext.define('Traccar.view.edit.Maintenances', {
             },
             renderer: function (value) {
                 var attribute = Ext.getStore('MaintenanceTypes').getById(value);
-                return attribute && attribute.get('name') ? attribute.get('name') : value;
+                return attribute && attribute.get('name') || value;
             }
         }, {
             text: Strings.maintenanceStart,
diff --git a/web/app/view/permissions/Maintenances.js b/web/app/view/permissions/Maintenances.js
index 7b5e3fb7..c5255769 100644
--- a/web/app/view/permissions/Maintenances.js
+++ b/web/app/view/permissions/Maintenances.js
@@ -40,7 +40,7 @@ Ext.define('Traccar.view.permissions.Maintenances', {
             },
             renderer: function (value) {
                 var attribute = Ext.getStore('MaintenanceTypes').getById(value);
-                return attribute && attribute.get('name') ? attribute.get('name') : value;
+                return attribute && attribute.get('name') || value;
             }
         }, {
             text: Strings.maintenanceStart,