From be47d612285d484e2d0a2aa43174fb8e36acd816 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 14 Sep 2017 09:38:14 +0500 Subject: Improve command type formatting --- web/app/view/edit/DevicesController.js | 1 - web/app/view/edit/SavedCommands.js | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'web/app/view/edit') diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js index 43bab22..915f724 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 8f1f6b3..869fbf9 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', -- cgit v1.2.3