aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/device/DeviceController.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-09-23 12:03:00 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-09-23 12:03:00 +1200
commit45249d656002ac258f18fbc4713408dcefc08ee2 (patch)
tree478fa035a5dfdf8dc2b8b4fedef35316781c1678 /web/app/view/device/DeviceController.js
parent7de3f92aed50668bca4187a3b9fb784923be1b34 (diff)
parent9c46d4cffe47dab99e87111a5e33aa5246c771ab (diff)
downloadtrackermap-server-45249d656002ac258f18fbc4713408dcefc08ee2.tar.gz
trackermap-server-45249d656002ac258f18fbc4713408dcefc08ee2.tar.bz2
trackermap-server-45249d656002ac258f18fbc4713408dcefc08ee2.zip
Merge changes from master branch
Diffstat (limited to 'web/app/view/device/DeviceController.js')
-rw-r--r--web/app/view/device/DeviceController.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/web/app/view/device/DeviceController.js b/web/app/view/device/DeviceController.js
index 58386596d..e2e82448d 100644
--- a/web/app/view/device/DeviceController.js
+++ b/web/app/view/device/DeviceController.js
@@ -19,10 +19,8 @@ Ext.define('Traccar.view.device.DeviceController', {
alias: 'controller.device',
requires: [
- 'Traccar.view.device.DeviceDialog',
'Traccar.view.CommandDialog',
'Traccar.view.user.UserDialog',
- 'Traccar.view.ServerDialog',
'Traccar.view.user.User',
'Traccar.view.login.LoginController'
],
@@ -51,7 +49,8 @@ Ext.define('Traccar.view.device.DeviceController', {
onAddClick: function() {
var device, dialog;
device = Ext.create('Traccar.model.Device');
- dialog = Ext.create('Traccar.view.device.DeviceDialog');
+ device.store = this.getView().getStore();
+ dialog = Ext.create('Traccar.view.DeviceDialog');
dialog.down('form').loadRecord(device);
dialog.show();
},
@@ -59,7 +58,7 @@ Ext.define('Traccar.view.device.DeviceController', {
onEditClick: function() {
var device, dialog;
device = this.getView().getSelectionModel().getSelection()[0];
- dialog = Ext.create('Traccar.view.device.DeviceDialog');
+ dialog = Ext.create('Traccar.view.DeviceDialog');
dialog.down('form').loadRecord(device);
dialog.show();
},
@@ -135,5 +134,4 @@ Ext.define('Traccar.view.device.DeviceController', {
this.getView().getSelectionModel().deselectAll();
}
}
-
});