aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/edit
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-09-14 09:38:14 +0500
committerAbyss777 <abyss@fox5.ru>2017-09-14 09:38:14 +0500
commitbe47d612285d484e2d0a2aa43174fb8e36acd816 (patch)
tree311da517ca347969c290b06285b4451fdfc6e98b /web/app/view/edit
parenta5d36c62facad98c409b9fcd4f8b92c3d47601ab (diff)
downloadetbsa-traccar-web-be47d612285d484e2d0a2aa43174fb8e36acd816.tar.gz
etbsa-traccar-web-be47d612285d484e2d0a2aa43174fb8e36acd816.tar.bz2
etbsa-traccar-web-be47d612285d484e2d0a2aa43174fb8e36acd816.zip
Improve command type formatting
Diffstat (limited to 'web/app/view/edit')
-rw-r--r--web/app/view/edit/DevicesController.js1
-rw-r--r--web/app/view/edit/SavedCommands.js7
2 files changed, 4 insertions, 4 deletions
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',