aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-05-16 16:53:31 +0500
committerAbyss777 <abyss@fox5.ru>2017-05-16 16:53:31 +0500
commit54137d72265355c04c4b71836d524391ea144998 (patch)
treed5b130414ed164586efb867b7649de1617f2c90c /web/app
parenta6765559b9388cea4ebc056cc207d7fc05206065 (diff)
downloadtrackermap-web-54137d72265355c04c4b71836d524391ea144998.tar.gz
trackermap-web-54137d72265355c04c4b71836d524391ea144998.tar.bz2
trackermap-web-54137d72265355c04c4b71836d524391ea144998.zip
- Added attribute column to permissions tables
- Fixed string
Diffstat (limited to 'web/app')
-rw-r--r--web/app/view/edit/UsersController.js2
-rw-r--r--web/app/view/permissions/DeviceAttributes.js5
-rw-r--r--web/app/view/permissions/GroupAttributes.js5
-rw-r--r--web/app/view/permissions/UserAttributes.js5
4 files changed, 16 insertions, 1 deletions
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
}]
}
});