diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-07-18 23:26:48 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-18 23:26:48 +1200 |
commit | 464711d63dafb44e89f3d4112f13250f268c11cd (patch) | |
tree | e4342fb8dd0f743fad8060ca1029504410ce4c21 /web/app/view | |
parent | d3e063cf9de8a45bed4dfe87b73aadfd8d2edeab (diff) | |
parent | bbfe8e8c328a660b8bdcdf089a8cd798cbbc5f2d (diff) | |
download | trackermap-server-464711d63dafb44e89f3d4112f13250f268c11cd.tar.gz trackermap-server-464711d63dafb44e89f3d4112f13250f268c11cd.tar.bz2 trackermap-server-464711d63dafb44e89f3d4112f13250f268c11cd.zip |
Merge pull request #2123 from Abyss777/device_attributes
Add attributes for devices
Diffstat (limited to 'web/app/view')
-rw-r--r-- | web/app/view/AttributesController.js | 3 | ||||
-rw-r--r-- | web/app/view/DeviceDialog.js | 19 | ||||
-rw-r--r-- | web/app/view/DeviceDialogController.js | 38 |
3 files changed, 57 insertions, 3 deletions
diff --git a/web/app/view/AttributesController.js b/web/app/view/AttributesController.js index 8e6ab82a4..5be94dec3 100644 --- a/web/app/view/AttributesController.js +++ b/web/app/view/AttributesController.js @@ -27,6 +27,9 @@ Ext.define('Traccar.view.AttributesController', { var store, propertyName, i = 0, attributes; store = Ext.create('Traccar.store.Attributes'); store.setProxy(Ext.create('Ext.data.proxy.Memory')); + if (typeof this.getView().record.get('attributes') === 'undefined') { + this.getView().record.set('attributes', {}); + } attributes = this.getView().record.get('attributes'); for (propertyName in attributes) { if (attributes.hasOwnProperty(propertyName)) { diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js index 37462ef88..2938d5dc3 100644 --- a/web/app/view/DeviceDialog.js +++ b/web/app/view/DeviceDialog.js @@ -18,10 +18,10 @@ Ext.define('Traccar.view.DeviceDialog', { extend: 'Traccar.view.BaseEditDialog', requires: [ - 'Traccar.view.BaseEditDialogController' + 'Traccar.view.DeviceDialogController' ], - controller: 'baseEditDialog', + controller: 'deviceDialog', title: Strings.deviceDialog, items: { @@ -45,5 +45,18 @@ Ext.define('Traccar.view.DeviceDialog', { displayField: 'name', valueField: 'id' }] - } + }, + + buttons: [{ + text : Strings.sharedAttributes, + handler: 'showAttributesView' + }, { + xtype: 'tbfill' + }, { + text: Strings.sharedSave, + handler: 'onSaveClick' + }, { + text: Strings.sharedCancel, + handler: 'closeView' + }] }); diff --git a/web/app/view/DeviceDialogController.js b/web/app/view/DeviceDialogController.js new file mode 100644 index 000000000..0a0f86883 --- /dev/null +++ b/web/app/view/DeviceDialogController.js @@ -0,0 +1,38 @@ +/* + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +Ext.define('Traccar.view.DeviceDialogController', { + extend: 'Traccar.view.BaseEditDialogController', + alias: 'controller.deviceDialog', + + requires: [ + 'Traccar.view.Attributes' + ], + + showAttributesView: function (button) { + var dialog, record; + dialog = button.up('window').down('form'); + record = dialog.getRecord(); + Ext.create('Traccar.view.BaseWindow', { + title: Strings.sharedAttributes, + modal: false, + items: { + xtype: 'attributesView', + record: record + } + }).show(); + } +}); |