From 94ea366eb33694447812e6d63133aea28379d6f4 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 18 Jul 2016 11:12:14 +0500
Subject: - Added attributes to devices

- Fixed license header for DeviceManager.java
- Fixed editing attributes for not saved (new) object.
---
 web/app/model/Device.js                |  2 ++
 web/app/view/AttributesController.js   |  3 +++
 web/app/view/DeviceDialog.js           | 19 ++++++++++++++---
 web/app/view/DeviceDialogController.js | 38 ++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 web/app/view/DeviceDialogController.js

(limited to 'web')

diff --git a/web/app/model/Device.js b/web/app/model/Device.js
index 247f72ba9..100f50f5b 100644
--- a/web/app/model/Device.js
+++ b/web/app/model/Device.js
@@ -39,5 +39,7 @@ Ext.define('Traccar.model.Device', {
         type: 'int'
     }, {
         name: 'geofenceIds'
+    }, {
+        name: 'attributes'
     }]
 });
diff --git a/web/app/view/AttributesController.js b/web/app/view/AttributesController.js
index 8e6ab82a4..c042b765f 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 (this.getView().record.phantom) {
+            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();
+    }
+});
-- 
cgit v1.2.3


From bbfe8e8c328a660b8bdcdf089a8cd798cbbc5f2d Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 18 Jul 2016 11:34:54 +0500
Subject: Fix it in other way in case user open "attributes" again before save.

---
 web/app/view/AttributesController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/app/view/AttributesController.js b/web/app/view/AttributesController.js
index c042b765f..5be94dec3 100644
--- a/web/app/view/AttributesController.js
+++ b/web/app/view/AttributesController.js
@@ -27,7 +27,7 @@ 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 (this.getView().record.phantom) {
+        if (typeof this.getView().record.get('attributes') === 'undefined') {
             this.getView().record.set('attributes', {});
         }
         attributes = this.getView().record.get('attributes');
-- 
cgit v1.2.3