Organize onCommandClick function

1 files changed, 7 insertions, 3 deletions

diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index d65055e7..742077b2 100644
--- a/web/app/view/DevicesController.js
+++ b/web/app/view/DevicesController.js
@@ -74,16 +74,20 @@ Ext.define('Traccar.view.DevicesController', {
     },
 
     onCommandClick: function () {
-        var device, deviceId, command, dialog, comboStore, online;
+        var device, deviceId, command, dialog, typesStore, online;
         device = this.getView().getSelectionModel().getSelection()[0];
         online = device.get('status') === 'online';
         deviceId = device.get('id');
+
         command = Ext.create('Traccar.model.Command');
         command.set('deviceId', deviceId);
         command.set('textChannel', !online);
+
         dialog = Ext.create('Traccar.view.CommandDialog');
-        comboStore = dialog.down('form').down('combobox').getStore();
-        comboStore.getProxy().setExtraParam('deviceId', deviceId);
+
+        typesStore = dialog.lookupReference('commandType').getStore();
+        typesStore.getProxy().setExtraParam('deviceId', deviceId);
+
         dialog.down('form').loadRecord(command);
         dialog.lookupReference('textChannelCheckBox').setDisabled(!online);
         dialog.show();