aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-26 09:38:05 +1200
committerGitHub <noreply@github.com>2016-07-26 09:38:05 +1200
commit7bbeccee30f5fa207d2754d977d9e5b7c4c857d8 (patch)
tree25c8bfa3f1b0c460063b5d8efd5f06a9f13fe7c8
parent2c48057bd628c523fbfad0559b3a1627daa46e47 (diff)
parent0c1c9b07aafcf02d2be4129517fd0c87f01cf9d4 (diff)
downloadtraccar-server-7bbeccee30f5fa207d2754d977d9e5b7c4c857d8.tar.gz
traccar-server-7bbeccee30f5fa207d2754d977d9e5b7c4c857d8.tar.bz2
traccar-server-7bbeccee30f5fa207d2754d977d9e5b7c4c857d8.zip
Merge pull request #2158 from Abyss777/attributes
Fix attribute editing
-rw-r--r--web/app/view/AttributeController.js42
-rw-r--r--web/app/view/AttributeDialog.js16
-rw-r--r--web/app/view/BaseEditDialogController.js4
3 files changed, 58 insertions, 4 deletions
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');