Fixed labels for run-as users and groups.

The labels for the run-as users and groups tables in sudo rule details
page have been modified to improve the clarity.

Ticket #1752

install/ui/association.js

@@ -324,7 +324,7 @@ IPA.association_table_widget = function (spec) {
         if (!that.columns.length) {
             that.create_column({
                 name: that.name,
-                label: IPA.metadata.objects[that.other_entity].label,
+                label: that.label,
                 entity_name: that.other_entity,
                 primary_key: true,
                 link: true

install/ui/hbac.js

@@ -187,6 +187,7 @@ IPA.hbacrule_details_facet = function(spec) {
         section.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberuser_user',
             name: 'memberuser_user',
+            entity: that.entity,
             add_method: 'add_user',
             remove_method: 'remove_user',
             add_title: IPA.messages.association.add.member,
@@ -195,6 +196,7 @@ IPA.hbacrule_details_facet = function(spec) {
         section.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberuser_group',
             name: 'memberuser_group',
+            entity: that.entity,
             add_method: 'add_user',
             remove_method: 'remove_user',
             add_title: IPA.messages.association.add.member,
@@ -226,6 +228,7 @@ IPA.hbacrule_details_facet = function(spec) {
         section.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberhost_host',
             name: 'memberhost_host',
+            entity: that.entity,
             add_method: 'add_host',
             remove_method: 'remove_host',
             add_title: IPA.messages.association.add.member,
@@ -234,6 +237,7 @@ IPA.hbacrule_details_facet = function(spec) {
         section.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberhost_hostgroup',
             name: 'memberhost_hostgroup',
+            entity: that.entity,
             add_method: 'add_host',
             remove_method: 'remove_host',
             add_title: IPA.messages.association.add.member,
@@ -266,6 +270,7 @@ IPA.hbacrule_details_facet = function(spec) {
         section.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberservice_hbacsvc',
             name: 'memberservice_hbacsvc',
+            entity: that.entity,
             add_method: 'add_service',
             remove_method: 'remove_service',
             add_title: IPA.messages.association.add.member,
@@ -274,6 +279,7 @@ IPA.hbacrule_details_facet = function(spec) {
         section.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberservice_hbacsvcgroup',
             name: 'memberservice_hbacsvcgroup',
+            entity: that.entity,
             add_method: 'add_service',
             remove_method: 'remove_service',
             add_title: IPA.messages.association.add.member,
@@ -305,6 +311,7 @@ IPA.hbacrule_details_facet = function(spec) {
         section.add_field(IPA.association_table_widget({
             id: that.entity.name+'-sourcehost_host',
             name: 'sourcehost_host',
+            entity: that.entity,
             add_method: 'add_sourcehost',
             remove_method: 'remove_sourcehost',
             add_title: IPA.messages.association.add.sourcehost,
@@ -313,6 +320,7 @@ IPA.hbacrule_details_facet = function(spec) {
         section.add_field(IPA.association_table_widget({
             id: that.entity.name+'-sourcehost_hostgroup',
             name: 'sourcehost_hostgroup',
+            entity: that.entity,
             add_method: 'add_sourcehost',
             remove_method: 'remove_sourcehost',
             add_title: IPA.messages.association.add.sourcehost,

install/ui/sudo.js

@@ -450,12 +450,12 @@ IPA.sudorule_details_facet = function(spec) {
     that.add_section(options_section());
     that.add_section(user_section());
     that.add_section(host_section());
-    that.add_section( IPA.sudo.rule_details_command_section({
-            name: 'command',
-            entity: that.entity,
-            label: IPA.messages.objects.sudorule.command
+    that.add_section(IPA.sudo.rule_details_command_section({
+        name: 'command',
+        entity: that.entity,
+        label: IPA.messages.objects.sudorule.command
     }));
-    that.add_section( IPA.sudo.rule_details_runas_section({
+    that.add_section(IPA.sudo.rule_details_runas_section({
         name: 'runas',
         entity: that.entity,
         label: IPA.messages.objects.sudorule.runas
@@ -704,6 +704,7 @@ IPA.sudo.rule_details_command_section = function(spec) {
         that.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberallowcmd_sudocmd',
             name: 'memberallowcmd_sudocmd',
+            entity: that.entity,
             add_method: 'add_allow_command',
             remove_method: 'remove_allow_command',
             add_title: IPA.messages.association.add.memberallowcmd,
@@ -712,6 +713,7 @@ IPA.sudo.rule_details_command_section = function(spec) {
         that.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberallowcmd_sudocmdgroup',
             name: 'memberallowcmd_sudocmdgroup',
+            entity: that.entity,
             add_method: 'add_allow_command',
             remove_method: 'remove_allow_command',
             add_title: IPA.messages.association.add.memberallowcmd,
@@ -721,6 +723,7 @@ IPA.sudo.rule_details_command_section = function(spec) {
         that.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberdenycmd_sudocmd',
             name: 'memberdenycmd_sudocmd',
+            entity: that.entity,
             add_method: 'add_deny_command',
             remove_method: 'remove_deny_command',
             add_title: IPA.messages.association.add.memberdenycmd,
@@ -729,6 +732,7 @@ IPA.sudo.rule_details_command_section = function(spec) {
         that.add_field(IPA.association_table_widget({
             id: that.entity.name+'-memberdenycmd_sudocmdgroup',
             name: 'memberdenycmd_sudocmdgroup',
+            entity: that.entity,
             add_method: 'add_deny_command',
             remove_method: 'remove_deny_command',
             add_title: IPA.messages.association.add.memberdenycmd,
@@ -870,6 +874,7 @@ IPA.sudo.rule_details_runas_section = function(spec) {
         that.add_field(IPA.sudorule_association_table_widget({
             id: that.entity.name+'-runasruser_user',
             name: 'ipasudorunas_user',
+            entity: that.entity,
             add_method: 'add_runasuser',
             remove_method: 'remove_runasuser',
             add_title: IPA.messages.association.add.ipasudorunas,
@@ -878,6 +883,7 @@ IPA.sudo.rule_details_runas_section = function(spec) {
         that.add_field(IPA.sudorule_association_table_widget({
             id: that.entity.name+'-runasuser_group',
             name: 'ipasudorunas_group',
+            entity: that.entity,
             add_method: 'add_runasuser',
             remove_method: 'remove_runasuser',
             add_title: IPA.messages.association.add.ipasudorunas,
@@ -902,6 +908,7 @@ IPA.sudo.rule_details_runas_section = function(spec) {
         that.add_field(IPA.sudorule_association_table_widget({
             id: that.entity.name+'-runasgroup_group',
             name: 'ipasudorunasgroup_group',
+            entity: that.entity,
             add_method: 'add_runasgroup',
             remove_method: 'remove_runasgroup',
             add_title: IPA.messages.association.add.ipasudorunasgroup,

ipalib/plugins/hbacrule.py

@@ -189,7 +189,7 @@ class hbacrule(LDAPObject):
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('memberuser_group?',
-            label=_('Groups'),
+            label=_('User Groups'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('memberhost_host?',
@@ -201,11 +201,11 @@ class hbacrule(LDAPObject):
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('sourcehost_host?',
-            label=_('Source hosts'),
+            label=_('Source Hosts'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('sourcehost_hostgroup?',
-            label=_('Source host groups'),
+            label=_('Source Host Groups'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('memberservice_hbacsvc?',

ipalib/plugins/sudorule.py

@@ -141,7 +141,7 @@ class sudorule(LDAPObject):
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('memberuser_group?',
-            label=_('Groups'),
+            label=_('User Groups'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('memberhost_host?',
@@ -161,21 +161,21 @@ class sudorule(LDAPObject):
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('memberallowcmd_sudocmdgroup?',
-            label=_('Sudo Command Groups'),
+            label=_('Sudo Allow Command Groups'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('memberdenycmd_sudocmdgroup?',
-            label=_('Sudo Command Groups'),
+            label=_('Sudo Deny Command Groups'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('ipasudorunas_user?',
-            label=_('RunAs User'),
-            doc=_('Run as a user or any user within a specified group'),
+            label=_('RunAs Users'),
+            doc=_('Run as a user'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('ipasudorunas_group?',
-            label=_('RunAs Group'),
-            doc=_('Run with the gid of a specified POSIX group '),
+            label=_('Groups of RunAs Users'),
+            doc=_('Run as any user within a specified group'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('externaluser?', validate_externaluser,
@@ -198,7 +198,8 @@ class sudorule(LDAPObject):
             flags=['no_create', 'no_update', 'no_search'],
         ),
         Str('ipasudorunasgroup_group?',
-            label=_('RunAsGroup Group'),
+            label=_('RunAs Groups'),
+            doc=_('Run with the gid of a specified POSIX group'),
             flags=['no_create', 'no_update', 'no_search'],
         ),
     )