From 54137d72265355c04c4b71836d524391ea144998 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 16 May 2017 16:53:31 +0500
Subject: - Added attribute column to permissions tables - Fixed string

---
 web/app/view/edit/UsersController.js         | 2 +-
 web/app/view/permissions/DeviceAttributes.js | 5 +++++
 web/app/view/permissions/GroupAttributes.js  | 5 +++++
 web/app/view/permissions/UserAttributes.js   | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'web/app')

diff --git a/web/app/view/edit/UsersController.js b/web/app/view/edit/UsersController.js
index f4ef4012..fe69d40c 100644
--- a/web/app/view/edit/UsersController.js
+++ b/web/app/view/edit/UsersController.js
@@ -159,7 +159,7 @@ Ext.define('Traccar.view.edit.UsersController', {
     onAttributesClick: function () {
         var user = this.getView().getSelectionModel().getSelection()[0];
         Ext.create('Traccar.view.BaseWindow', {
-            title: Strings.sharedCalendars,
+            title: Strings.sharedComputedAttributes,
             items: {
                 xtype: 'userAttributesView',
                 baseObjectName: 'userId',
diff --git a/web/app/view/permissions/DeviceAttributes.js b/web/app/view/permissions/DeviceAttributes.js
index 43b3d253..2f837c42 100644
--- a/web/app/view/permissions/DeviceAttributes.js
+++ b/web/app/view/permissions/DeviceAttributes.js
@@ -26,6 +26,11 @@ Ext.define('Traccar.view.permissions.DeviceAttributes', {
             dataIndex: 'description',
             flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
+        }, {
+            text: Strings.sharedAttribute,
+            dataIndex: 'attribute',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
         }]
     }
 });
diff --git a/web/app/view/permissions/GroupAttributes.js b/web/app/view/permissions/GroupAttributes.js
index 10e894d3..a08eb78e 100644
--- a/web/app/view/permissions/GroupAttributes.js
+++ b/web/app/view/permissions/GroupAttributes.js
@@ -26,6 +26,11 @@ Ext.define('Traccar.view.permissions.GroupAttributes', {
             dataIndex: 'description',
             flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
+        }, {
+            text: Strings.sharedAttribute,
+            dataIndex: 'attribute',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
         }]
     }
 });
diff --git a/web/app/view/permissions/UserAttributes.js b/web/app/view/permissions/UserAttributes.js
index 3129ad65..056c4634 100644
--- a/web/app/view/permissions/UserAttributes.js
+++ b/web/app/view/permissions/UserAttributes.js
@@ -26,6 +26,11 @@ Ext.define('Traccar.view.permissions.UserAttributes', {
             dataIndex: 'description',
             flex: 1,
             minWidth: Traccar.Style.columnWidthNormal
+        }, {
+            text: Strings.sharedAttribute,
+            dataIndex: 'attribute',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
         }]
     }
 });
-- 
cgit v1.2.3