diff options
author | Endi S. Dewata <edewata@redhat.com> | 2011-09-08 09:44:17 -0500 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2011-09-09 19:47:27 +0000 |
commit | a95b44face7f3001a27e2ff42c07a5ae1edabc83 (patch) | |
tree | 42c9ecd1253a2f6680355c141cd82f91b7dff418 | |
parent | 26ded75be94e60a34a19d06ce4a5fb3185875cd5 (diff) | |
download | freeipa-a95b44face7f3001a27e2ff42c07a5ae1edabc83.tar.gz freeipa-a95b44face7f3001a27e2ff42c07a5ae1edabc83.tar.xz freeipa-a95b44face7f3001a27e2ff42c07a5ae1edabc83.zip |
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
-rw-r--r-- | install/ui/association.js | 8 | ||||
-rw-r--r-- | 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 1c9776b0e..c7a1b6c0b 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 1e1b5a6b7..4806c17b3 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, |