Improve command type formatting

10 files changed, 25 insertions, 23 deletions

diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 8a9e3dca..289aff91 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -130,6 +130,11 @@ Ext.define('Traccar.AttributeFormatter', {
         return null;
     },
 
+    commandTypeFormatter: function (value) {
+        var name = Strings['command' + value.charAt(0).toUpperCase() + value.slice(1)];
+        return name ? name : value;
+    },
+
     defaultFormatter: function (value) {
         if (typeof value === 'number') {
             return Number(value.toFixed(Traccar.Style.numberPrecision));
@@ -175,6 +180,8 @@ Ext.define('Traccar.AttributeFormatter', {
                 return this.volumeFormatter;
             case 'driverUniqueId':
                 return this.driverUniqueIdFormatter;
+            case 'commandType':
+                return this.commandTypeFormatter;
             default:
                 return this.defaultFormatter;
         }
diff --git a/web/app/model/Command.js b/web/app/model/Command.js
index aa3dad14..f64d2a4b 100644
--- a/web/app/model/Command.js
+++ b/web/app/model/Command.js
@@ -32,14 +32,6 @@ Ext.define('Traccar.model.Command', {
         name: 'type',
         type: 'string'
     }, {
-        name: 'name',
-        convert: function (v, rec) {
-            var name = Strings['command' + rec.get('type').charAt(0).toUpperCase() + rec.get('type').slice(1)];
-            return name ? name : rec.get('type');
-        },
-        depends: ['type'],
-        persist: false
-    }, {
         name: 'textChannel',
         type: 'boolean'
     }, {
diff --git a/web/app/model/KnownCommand.js b/web/app/model/KnownCommand.js
index 08213020..06610e32 100644
--- a/web/app/model/KnownCommand.js
+++ b/web/app/model/KnownCommand.js
@@ -25,8 +25,7 @@ Ext.define('Traccar.model.KnownCommand', {
     }, {
         name: 'name',
         convert: function (v, rec) {
-            var name = Strings['command' + rec.get('type').charAt(0).toUpperCase() + rec.get('type').slice(1)];
-            return name ? name : rec.get('type');
+            return Traccar.AttributeFormatter.getFormatter('commandType')(rec.get('type'));
         },
         depends: ['type']
     }, {
diff --git a/web/app/view/dialog/BaseEditController.js b/web/app/view/dialog/BaseEditController.js
index f58b6cb7..91379e2d 100644
--- a/web/app/view/dialog/BaseEditController.js
+++ b/web/app/view/dialog/BaseEditController.js
@@ -43,7 +43,7 @@ Ext.define('Traccar.view.dialog.BaseEditController', {
         } else {
             record.save();
         }
-        button.up('window').close();
+        this.closeView();
     },
 
     showAttributesView: function (button) {
diff --git a/web/app/view/dialog/SendCommand.js b/web/app/view/dialog/SendCommand.js
index 0bb7d610..f4224bec 100644
--- a/web/app/view/dialog/SendCommand.js
+++ b/web/app/view/dialog/SendCommand.js
@@ -29,7 +29,7 @@ Ext.define('Traccar.view.dialog.SendCommand', {
     items: [{
         xtype: 'combobox',
         reference: 'commandsComboBox',
-        fieldLabel: Strings.sharedSavedCommand,
+        fieldLabel: Strings.deviceCommand,
         displayField: 'description',
         valueField: 'id',
         store: 'DeviceCommands',
diff --git a/web/app/view/dialog/SendCommandController.js b/web/app/view/dialog/SendCommandController.js
index 3bd2ad4a..0e9442ab 100644
--- a/web/app/view/dialog/SendCommandController.js
+++ b/web/app/view/dialog/SendCommandController.js
@@ -36,9 +36,7 @@ Ext.define('Traccar.view.dialog.SendCommandController', {
         Ext.Ajax.request({
             scope: this,
             url: 'api/commands/send',
-            jsonData: record.getData({
-                persist: true
-            }),
+            jsonData: record.getData(),
             callback: this.onSendResult
         });
     },
@@ -89,5 +87,10 @@ Ext.define('Traccar.view.dialog.SendCommandController', {
         } else {
             Traccar.app.showError(response);
         }
+    },
+
+    closeView: function () {
+        this.lookupReference('commandsComboBox').getStore().removeAll();
+        this.callParent(arguments);
     }
 });
diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js
index 43bab228..915f724a 100644
--- a/web/app/view/edit/DevicesController.js
+++ b/web/app/view/edit/DevicesController.js
@@ -126,7 +126,6 @@ Ext.define('Traccar.view.edit.DevicesController', {
 
         commandsStore = dialog.lookupReference('commandsComboBox').getStore();
         commandsStore.getProxy().setExtraParam('deviceId', deviceId);
-        commandsStore.removeAll();
         if (!Traccar.app.getPreference('limitCommands', false)) {
             commandsStore.add({
                 id: 0,
diff --git a/web/app/view/edit/SavedCommands.js b/web/app/view/edit/SavedCommands.js
index 8f1f6b38..869fbf9a 100644
--- a/web/app/view/edit/SavedCommands.js
+++ b/web/app/view/edit/SavedCommands.js
@@ -50,13 +50,14 @@ Ext.define('Traccar.view.edit.SavedCommands', {
             filter: 'string'
         }, {
             text: Strings.sharedType,
-            dataIndex: 'name',
+            dataIndex: 'type',
             filter: {
                 type: 'list',
-                idField: 'name',
+                idField: 'type',
                 labelField: 'name',
                 store: 'AllCommandTypes'
-            }
+            },
+            renderer: Traccar.AttributeFormatter.getFormatter('commandType')
         }, {
             text: Strings.notificationSms,
             dataIndex: 'textChannel',
diff --git a/web/app/view/permissions/SavedCommands.js b/web/app/view/permissions/SavedCommands.js
index 1c7ab775..106fad52 100644
--- a/web/app/view/permissions/SavedCommands.js
+++ b/web/app/view/permissions/SavedCommands.js
@@ -35,15 +35,16 @@ Ext.define('Traccar.view.permissions.SavedCommands', {
             filter: 'string'
         }, {
             text: Strings.sharedType,
-            dataIndex: 'name',
+            dataIndex: 'type',
             flex: 1,
             minWidth: Traccar.Style.columnWidthNormal,
             filter: {
                 type: 'list',
-                idField: 'name',
+                idField: 'type',
                 labelField: 'name',
                 store: 'AllCommandTypes'
-            }
+            },
+            renderer: Traccar.AttributeFormatter.getFormatter('commandType')
         }, {
             text: Strings.notificationSms,
             dataIndex: 'textChannel',
diff --git a/web/l10n/en.json b/web/l10n/en.json
index de0cb7ee..aeb20ddc 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -71,7 +71,7 @@
     "sharedInfoTitle": "Info",
     "sharedSavedCommand": "Saved Command",
     "sharedSavedCommands": "Saved Commands",
-    "sharedNew": "New ...",
+    "sharedNew": "New…",
     "attributeSpeedLimit": "Speed Limit",
     "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
     "attributeMaintenanceStart": "Maintenance: Start",