diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-03-09 23:13:06 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-03-09 23:13:06 +1300 |
commit | 5634860cbe5c43007df354acba79d5051c1eb987 (patch) | |
tree | 1c0eb8043b2a83eaa92f0902a4e67b3c4c22d82d /web/app/view | |
parent | 71c5871dc0221d7a82851f2c3ca3cd2b594982f2 (diff) | |
download | traccar-server-5634860cbe5c43007df354acba79d5051c1eb987.tar.gz traccar-server-5634860cbe5c43007df354acba79d5051c1eb987.tar.bz2 traccar-server-5634860cbe5c43007df354acba79d5051c1eb987.zip |
Add parent field for device and group
Diffstat (limited to 'web/app/view')
-rw-r--r-- | web/app/view/DeviceDialog.js | 7 | ||||
-rw-r--r-- | web/app/view/GroupDialog.js | 7 | ||||
-rw-r--r-- | web/app/view/GroupsController.js | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js index 318ac4ffe..4a22ca008 100644 --- a/web/app/view/DeviceDialog.js +++ b/web/app/view/DeviceDialog.js @@ -36,6 +36,13 @@ Ext.define('Traccar.view.DeviceDialog', { name: 'uniqueId', fieldLabel: Strings.deviceIdentifier, allowBlank: false + }, { + xtype: 'combobox', + name: 'groupId', + fieldLabel: Strings.groupParent, + store: 'Groups', + displayField: 'name', + valueField: 'id' }] } }); diff --git a/web/app/view/GroupDialog.js b/web/app/view/GroupDialog.js index a34e33aa0..2cca61ef5 100644 --- a/web/app/view/GroupDialog.js +++ b/web/app/view/GroupDialog.js @@ -31,6 +31,13 @@ Ext.define('Traccar.view.GroupDialog', { name: 'name', fieldLabel: Strings.sharedName, allowBlank: false + }, { + xtype: 'combobox', + name: 'groupId', + fieldLabel: Strings.groupParent, + store: 'Groups', + displayField: 'name', + valueField: 'id' }] } }); diff --git a/web/app/view/GroupsController.js b/web/app/view/GroupsController.js index 34b259658..6cc568ea2 100644 --- a/web/app/view/GroupsController.js +++ b/web/app/view/GroupsController.js @@ -18,10 +18,6 @@ Ext.define('Traccar.view.GroupsController', { extend: 'Ext.app.ViewController', alias: 'controller.groups', - init: function () { - Ext.getStore('Groups').load(); - }, - onAddClick: function () { var group, dialog; group = Ext.create('Traccar.model.Group'); |