The adder dialog for the user and host tables in sudo rule details
page have been fixed to use --not-in-sudorules to avoid showing
entries that are already added into the rule either directly or
indirectly via groups.
This does not apply to the command and run-as tables because they
do not support such option.
Ticket #1768
--
Endi S. Dewata
From a794e3de7376a04235cd5222086b389b3aee1e8e Mon Sep 17 00:00:00 2001
From: Endi S. Dewata <edew...@redhat.com>
Date: Thu, 8 Sep 2011 09:44:17 -0500
Subject: [PATCH] Fixed sudo rule association dialogs.
The adder dialog for the user and host tables in sudo rule details
page have been fixed to use --not-in-sudorules to avoid showing
entries that are already added into the rule either directly or
indirectly via groups.
This does not apply to the command and run-as tables because they
do not support such option.
Ticket #1768
---
install/ui/association.js | 8 +++++---
install/ui/sudo.js | 11 +++++++----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/install/ui/association.js b/install/ui/association.js
index 1c9776b0e6c596be4dd07665b141891d2e7d4ba0..c7a1b6c0b9e94e7a8b4aa1c73c35c7c8e2ab4e54 100644
--- a/install/ui/association.js
+++ b/install/ui/association.js
@@ -493,13 +493,15 @@ IPA.association_table_widget = function (spec) {
};
that.create_add_dialog = function() {
+
+ var entity_label = that.entity.metadata.label_singular;
var pkey = IPA.nav.get_state(that.entity.name+'-pkey');
- var label = IPA.metadata.objects[that.other_entity].label;
+ var other_entity_label = IPA.metadata.objects[that.other_entity].label;
var title = that.add_title;
- title = title.replace('${entity}', that.entity.metadata.label_singular);
+ title = title.replace('${entity}', entity_label);
title = title.replace('${primary_key}', pkey);
- title = title.replace('${other_entity}', label);
+ title = title.replace('${other_entity}', other_entity_label);
return IPA.association_adder_dialog({
title: title,
diff --git a/install/ui/sudo.js b/install/ui/sudo.js
index 1a6b03b1be00dc093b10c38e2930d3af0b4cfcb7..c443ba9d846b9a9d20ec16f875a9c995dddb5e82 100644
--- a/install/ui/sudo.js
+++ b/install/ui/sudo.js
@@ -1042,18 +1042,21 @@ IPA.sudorule_association_table_widget = function(spec) {
that.create_add_dialog = function() {
+ var entity_label = that.entity.metadata.label_singular;
var pkey = IPA.nav.get_state(that.entity.name+'-pkey');
+ var other_entity_label = IPA.metadata.objects[that.other_entity].label;
var title = that.add_title;
- title = title.replace('${other_entity}', IPA.metadata.objects[that.other_entity].label);
- title = title.replace('${entity}', IPA.metadata.objects[that.entity.name].label_singular);
+ title = title.replace('${entity}', entity_label);
title = title.replace('${primary_key}', pkey);
+ title = title.replace('${other_entity}', other_entity_label);
return IPA.sudo.rule_association_adder_dialog({
title: title,
pkey: pkey,
other_entity: that.other_entity,
- entity:that.entity,
+ attribute_member: that.attribute_member,
+ entity: that.entity,
external: that.external
});
};
@@ -1085,7 +1088,7 @@ IPA.sudo.rule_association_adder_dialog = function(spec) {
if (!that.columns.length) {
var pkey_name = IPA.metadata.objects[that.other_entity].primary_key;
that.create_column({
- entity:that.entity,
+ entity: that.entity,
name: pkey_name,
label: IPA.metadata.objects[that.other_entity].label,
primary_key: true,
--
1.7.5.1
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
