From 788a499b346724d753798597fb18f8aef17e1588 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 18 May 2017 10:01:49 +0500 Subject: Implement known position attributes --- web/app/view/permissions/DeviceAttributes.js | 10 +++++++++- web/app/view/permissions/GroupAttributes.js | 10 +++++++++- web/app/view/permissions/UserAttributes.js | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) (limited to 'web/app/view/permissions') diff --git a/web/app/view/permissions/DeviceAttributes.js b/web/app/view/permissions/DeviceAttributes.js index 2f837c42..baca9d3e 100644 --- a/web/app/view/permissions/DeviceAttributes.js +++ b/web/app/view/permissions/DeviceAttributes.js @@ -30,7 +30,15 @@ Ext.define('Traccar.view.permissions.DeviceAttributes', { text: Strings.sharedAttribute, dataIndex: 'attribute', flex: 1, - minWidth: Traccar.Style.columnWidthNormal + minWidth: Traccar.Style.columnWidthNormal, + renderer: function (value) { + var attribute = Ext.getStore('PositionAttributes').getById(value); + if (attribute) { + return attribute.get('name'); + } else { + return value; + } + } }] } }); diff --git a/web/app/view/permissions/GroupAttributes.js b/web/app/view/permissions/GroupAttributes.js index a08eb78e..3972dbec 100644 --- a/web/app/view/permissions/GroupAttributes.js +++ b/web/app/view/permissions/GroupAttributes.js @@ -30,7 +30,15 @@ Ext.define('Traccar.view.permissions.GroupAttributes', { text: Strings.sharedAttribute, dataIndex: 'attribute', flex: 1, - minWidth: Traccar.Style.columnWidthNormal + minWidth: Traccar.Style.columnWidthNormal, + renderer: function (value) { + var attribute = Ext.getStore('PositionAttributes').getById(value); + if (attribute) { + return attribute.get('name'); + } else { + return value; + } + } }] } }); diff --git a/web/app/view/permissions/UserAttributes.js b/web/app/view/permissions/UserAttributes.js index 056c4634..8a8a4543 100644 --- a/web/app/view/permissions/UserAttributes.js +++ b/web/app/view/permissions/UserAttributes.js @@ -30,7 +30,15 @@ Ext.define('Traccar.view.permissions.UserAttributes', { text: Strings.sharedAttribute, dataIndex: 'attribute', flex: 1, - minWidth: Traccar.Style.columnWidthNormal + minWidth: Traccar.Style.columnWidthNormal, + renderer: function (value) { + var attribute = Ext.getStore('PositionAttributes').getById(value); + if (attribute) { + return attribute.get('name'); + } else { + return value; + } + } }] } }); -- cgit v1.2.3