UserView.js: display role

diff --git a/js/RoleSelector.js b/js/RoleSelector.js
index 1b84e0af7c69277fc0cf4e5c0fd7b466665504f6..da78bfa67dbeeb16c5608b6a2c951d11a7588349 100644 (file)
--- a/js/RoleSelector.js
+++ b/js/RoleSelector.js
@@ -3,8 +3,8 @@ Ext.define('PMG.RoleSelector', {
     alias: 'widget.pmgRoleSelector',
 
     comboItems: [
-       ['admin', gettext('Administrator')],
-       ['qmanager', gettext('Quarantine Manager')],
-       ['audit', gettext('Auditor')]
+       ['admin', PMG.Utils.format_user_role('admin')],
+       ['qmanager', PMG.Utils.format_user_role('qmanager')],
+       ['audit', PMG.Utils.format_user_role('audit')]
     ]
 });

diff --git a/js/UserView.js b/js/UserView.js
index 5b99824f6d1268582dd9430d60e942e8a59d7b0f..63b446c886de390942bf846b6ef2374c4b1ce288 100644 (file)
--- a/js/UserView.js
+++ b/js/UserView.js
@@ -132,6 +132,13 @@ Ext.define('PMG.UserView', {
            sortable: true,
            dataIndex: 'realm'
        },
+       {
+           header: gettext('Role'),
+           width: 150,
+           sortable: true,
+           renderer: PMG.Utils.format_user_role,
+           dataIndex: 'role'
+       },
        {
            header: gettext('Enabled'),
            width: 80,

diff --git a/js/Utils.js b/js/Utils.js
index 53572863729158aa4a9475a22513760382a7a665..fed1b145c60fd11184a121e47a22a3098b017747 100644 (file)
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -13,6 +13,17 @@ Ext.define('PMG.Utils', {
     receiverText: gettext('Receiver'),
     scoreText: gettext('Score'),
 
+    user_role_text: {
+       root: gettext('Superuser'),
+       admin: gettext('Administrator'),
+       qmanager: gettext('Quarantine Manager'),
+       audit: gettext('Auditor'),
+    },
+
+    format_user_role: function(role) {
+       return PMG.Utils.user_role_text[role] || role;
+    },
+
     oclass_text: {
        who: gettext('Who Objects'),
        what: gettext('What Objects'),