From 647071c9483daa2046d7f75c335b2763672befc6 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 28 Jun 2016 22:49:08 +0500
Subject: Added attributes editor

---
 web/app/view/UserDialog.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'web/app/view/UserDialog.js')

diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js
index 6b768c887..02c1342ac 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/UserDialog.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.UserDialog', {
     controller: 'userDialog',
     title: Strings.settingsUser,
 
-    items: {
+    items: [{
         xtype: 'form',
         items: [{
             xtype: 'textfield',
@@ -89,5 +89,9 @@ Ext.define('Traccar.view.UserDialog', {
             fieldLabel: Strings.settingsTwelveHourFormat,
             allowBlank: false
         }]
-    }
+    }, {
+        xtype: 'button',
+        text : Strings.sharedAttributes,
+        handler: 'attributesView'
+    }]
 });
-- 
cgit v1.2.3


From 36ec2ef7afb334d3b34a6bf0f1df13c5f27456c1 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 29 Jun 2016 07:32:37 +0500
Subject: Minor fixes

---
 web/app/view/AttributeDialog.js      | 2 +-
 web/app/view/UserDialog.js           | 2 +-
 web/app/view/UserDialogController.js | 2 +-
 web/l10n/en.json                     | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'web/app/view/UserDialog.js')

diff --git a/web/app/view/AttributeDialog.js b/web/app/view/AttributeDialog.js
index 6ba7aeedf..be06b7576 100644
--- a/web/app/view/AttributeDialog.js
+++ b/web/app/view/AttributeDialog.js
@@ -22,7 +22,7 @@ Ext.define('Traccar.view.AttributeDialog', {
     ],
 
     controller: 'baseEditDialog',
-    title: Strings.stateName,
+    title: Strings.sharedAttribute,
 
     items: {
         xtype: 'form',
diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js
index 02c1342ac..b51997262 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/UserDialog.js
@@ -92,6 +92,6 @@ Ext.define('Traccar.view.UserDialog', {
     }, {
         xtype: 'button',
         text : Strings.sharedAttributes,
-        handler: 'attributesView'
+        handler: 'showAttributesView'
     }]
 });
diff --git a/web/app/view/UserDialogController.js b/web/app/view/UserDialogController.js
index b3496fe6a..db495b8ff 100644
--- a/web/app/view/UserDialogController.js
+++ b/web/app/view/UserDialogController.js
@@ -50,7 +50,7 @@ Ext.define('Traccar.view.UserDialogController', {
         button.up('window').close();
     },
 
-    attributesView: function (button) {
+    showAttributesView: function (button) {
         var dialog, record;
         dialog = button.up('window').down('form');
         record = dialog.getRecord();
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 7ed2037ac..97cee819d 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -21,6 +21,7 @@
     "sharedGeofences": "Geofences",
     "sharedNotifications": "Notifications",
     "sharedAttributes": "Attributes",
+    "sharedAttribute": "Attribute",
     "errorTitle": "Error",
     "errorUnknown": "Unknown error",
     "errorConnection": "Connection error",
-- 
cgit v1.2.3