diff options
| -rw-r--r-- | install/ui/association.js | 40 | ||||
| -rw-r--r-- | install/ui/dialog.js | 14 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 1 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 1 |
4 files changed, 18 insertions, 38 deletions
diff --git a/install/ui/association.js b/install/ui/association.js index 2c6a1d200..37bc95fda 100644 --- a/install/ui/association.js +++ b/install/ui/association.js @@ -176,28 +176,24 @@ IPA.association_adder_dialog = function (spec) { } } - var hide_checkbox = $('input[name=hidememb]', that.container); - - var options = {'all': true}; - if (hide_checkbox.attr('checked')) { - var relationships = IPA.metadata.objects[that.other_entity].relationships; - - /* TODO: better generic handling of different relationships! */ - var other_attribute_member = ''; - if (that.attribute_member == 'member') - other_attribute_member = 'memberof'; - else if (that.attribute_member == 'memberuser') - other_attribute_member = 'memberof'; - else if (that.attribute_member == 'memberhost') - other_attribute_member = 'memberof'; - else if (that.attribute_member == 'memberof') - other_attribute_member = 'member'; - - var relationship = relationships[other_attribute_member]; - if (relationship) { - var param_name = relationship[2] + that.entity.name; - options[param_name] = that.pkey; - } + var options = { all: true }; + var relationships = IPA.metadata.objects[that.other_entity].relationships; + + /* TODO: better generic handling of different relationships! */ + var other_attribute_member = ''; + if (that.attribute_member == 'member') + other_attribute_member = 'memberof'; + else if (that.attribute_member == 'memberuser') + other_attribute_member = 'memberof'; + else if (that.attribute_member == 'memberhost') + other_attribute_member = 'memberof'; + else if (that.attribute_member == 'memberof') + other_attribute_member = 'member'; + + var relationship = relationships[other_attribute_member]; + if (relationship) { + var param_name = relationship[2] + that.entity.name; + options[param_name] = that.pkey; } IPA.command({ diff --git a/install/ui/dialog.js b/install/ui/dialog.js index 3513f0c17..45d306158 100644 --- a/install/ui/dialog.js +++ b/install/ui/dialog.js @@ -394,20 +394,6 @@ IPA.adder_dialog = function (spec) { value: IPA.messages.buttons.find }).appendTo(top_panel); - $('<input/>', { - type: 'checkbox', - name: 'hidememb', - id: 'hidememb', - checked: 'checked', - style: 'margin-left: 5px; vertical-align: middle' - }).appendTo(top_panel); - - $('<label/>', { - 'for': 'hidememb', - text: IPA.messages.dialogs.hide_already_enrolled, - style: 'margin-left: 3px' - }).appendTo(top_panel); - top_panel.append(IPA.create_network_spinner()); var left_panel = $('<div/>', { diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index bd3255054..7820e1128 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -15885,7 +15885,6 @@ "confirmation": "Confirmation", "dirty_message": "This page has unsaved changes. Please save or revert.", "dirty_title": "Dirty", - "hide_already_enrolled": "Hide already enrolled.", "hide_details": "Hide details", "prospective": "Prospective", "remove_empty": "Select entries to be removed.", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 84d8fd3fa..bffd7b53e 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -355,7 +355,6 @@ class i18n_messages(Command): "confirmation":_("Confirmation"), "dirty_message":_("This page has unsaved changes. Please save or revert."), "dirty_title":_("Dirty"), - "hide_already_enrolled":_("Hide already enrolled."), "hide_details":_("Hide details"),\ "redirection":_("Redirection"), "remove_empty":_("Select entries to be removed."), |