From 0c1c9b07aafcf02d2be4129517fd0c87f01cf9d4 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 25 Jul 2016 20:46:21 +0500
Subject: Fix attribute editing

---
 web/app/view/AttributeController.js      | 42 ++++++++++++++++++++++++++++++++
 web/app/view/AttributeDialog.js          | 16 +++++++++---
 web/app/view/BaseEditDialogController.js |  4 +++
 3 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 web/app/view/AttributeController.js

(limited to 'web')

diff --git a/web/app/view/AttributeController.js b/web/app/view/AttributeController.js
new file mode 100644
index 000000000..932a6436b
--- /dev/null
+++ b/web/app/view/AttributeController.js
@@ -0,0 +1,42 @@
+/*
+ * 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.AttributeController', {
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.attributeDialog',
+
+    onSaveClick: function (button) {
+        var dialog, store, record;
+        dialog = button.up('window').down('form');
+        dialog.updateRecord();
+        record = dialog.getRecord();
+        store = record.store;
+        if (store) {
+            if (record.phantom) {
+                store.add(record);
+            }
+            store.sync({
+                failure: function (batch) {
+                    store.rejectChanges();
+                    Traccar.app.showError(batch.exceptions[0].getError().response);
+                }
+            });
+        } else {
+            record.save();
+        }
+        button.up('window').close();
+    }
+});
diff --git a/web/app/view/AttributeDialog.js b/web/app/view/AttributeDialog.js
index be06b7576..213891ecd 100644
--- a/web/app/view/AttributeDialog.js
+++ b/web/app/view/AttributeDialog.js
@@ -15,13 +15,13 @@
  */
 
 Ext.define('Traccar.view.AttributeDialog', {
-    extend: 'Traccar.view.BaseEditDialog',
+    extend: 'Traccar.view.BaseDialog',
 
     requires: [
-        'Traccar.view.BaseEditDialogController'
+        'Traccar.view.AttributeController'
     ],
 
-    controller: 'baseEditDialog',
+    controller: 'attributeDialog',
     title: Strings.sharedAttribute,
 
     items: {
@@ -35,5 +35,13 @@ Ext.define('Traccar.view.AttributeDialog', {
             name: 'value',
             fieldLabel: Strings.stateValue
         }]
-    }
+    },
+
+    buttons: [{
+        text: Strings.sharedSave,
+        handler: 'onSaveClick'
+    }, {
+        text: Strings.sharedCancel,
+        handler: 'closeView'
+    }]
 });
diff --git a/web/app/view/BaseEditDialogController.js b/web/app/view/BaseEditDialogController.js
index 511309650..79fd8f2b4 100644
--- a/web/app/view/BaseEditDialogController.js
+++ b/web/app/view/BaseEditDialogController.js
@@ -18,6 +18,10 @@ Ext.define('Traccar.view.BaseEditDialogController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.baseEditDialog',
 
+    requires: [
+        'Traccar.view.Attributes'
+    ],
+
     onSaveClick: function (button) {
         var dialog, store, record;
         dialog = button.up('window').down('form');
-- 
cgit v1.2.3