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

Ticket #1752

--
Endi S. Dewata
From c05edd38c54994a295c3d7d15477bd87a599ee0d Mon Sep 17 00:00:00 2001
From: Endi S. Dewata <edew...@redhat.com>
Date: Fri, 9 Sep 2011 18:58:52 -0500
Subject: [PATCH] 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          |    4 +++-
 install/ui/sudo.js                 |    3 +++
 install/ui/test/data/ipa_init.json |    3 +++
 ipalib/plugins/internal.py         |    3 +++
 4 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/install/ui/association.js b/install/ui/association.js
index a9cce8e841edbd75ed1de6c1e103f41fd2775a95..2adc6f5af955b87fb481179f03e21031100e2098 100644
--- a/install/ui/association.js
+++ b/install/ui/association.js
@@ -292,6 +292,8 @@ IPA.association_table_widget = function (spec) {
     that.other_entity = spec.other_entity;
     that.attribute_member = spec.attribute_member;
 
+    that.label = that.label || IPA.metadata.objects[that.other_entity].label;
+
     that.associator = spec.associator || IPA.bulk_associator;
     that.add_method = spec.add_method || 'add_member';
     that.remove_method = spec.remove_method || 'remove_member';
@@ -324,7 +326,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
diff --git a/install/ui/sudo.js b/install/ui/sudo.js
index 4806c17b33d3b38e827453aa47f412db4785f905..43e7c50dba26335174cdb3da61025bec8ebf7b57 100644
--- a/install/ui/sudo.js
+++ b/install/ui/sudo.js
@@ -870,6 +870,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',
+            label: IPA.messages.objects.sudorule.runas_users,
             add_method: 'add_runasuser',
             remove_method: 'remove_runasuser',
             add_title: IPA.messages.association.add.ipasudorunas,
@@ -878,6 +879,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',
+            label: IPA.messages.objects.sudorule.groups_of_runas_users,
             add_method: 'add_runasuser',
             remove_method: 'remove_runasuser',
             add_title: IPA.messages.association.add.ipasudorunas,
@@ -902,6 +904,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',
+            label: IPA.messages.objects.sudorule.runas_groups,
             add_method: 'add_runasgroup',
             remove_method: 'remove_runasgroup',
             add_title: IPA.messages.association.add.ipasudorunasgroup,
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index e15c2618814ef9a6714fc1fcda4ce8ac75f5e09b..9f02cd1864e2798430b9cd3c547aa76eb1c86f83 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -16211,11 +16211,14 @@
                             "command": "Run Commands",
                             "deny": "Deny",
                             "external": "External",
+                            "groups_of_runas_users": "Groups of RunAs Users",
                             "host": "Access this host",
                             "inactive": "Inactive",
                             "ipaenabledflag": "Rule status",
                             "options": "Options",
                             "runas": "As Whom",
+                            "runas_groups": "RunAs Groups",
+                            "runas_users": "RunAs Users",
                             "specified_commands": "Specified Commands and Groups",
                             "specified_groups": "Specified Groups",
                             "specified_hosts": "Specified Hosts and Groups",
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index b87fa27a38785f9a8034dafafd02f3ddda900173..bd1e9b97c6052f938f3f5f9c9a610a1ac4e7fca0 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -394,11 +394,14 @@ class i18n_messages(Command):
                 "command": _("Run Commands"),
                 "deny": _("Deny"),
                 "external": _("External"),
+                "groups_of_runas_users": _("Groups of RunAs Users"),
                 "host": _("Access this host"),
                 "inactive": _("Inactive"),
                 "ipaenabledflag": _("Rule status"),
                 "options": _("Options"),
                 "runas": _("As Whom"),
+                "runas_groups": _("RunAs Groups"),
+                "runas_users": _("RunAs Users"),
                 "specified_commands": _("Specified Commands and Groups"),
                 "specified_groups": _("Specified Groups"),
                 "specified_hosts": _("Specified Hosts and Groups"),
-- 
1.7.5.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to