diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2011-08-17 14:54:08 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2011-08-19 16:43:00 +0000 |
| commit | 6bf90a472b408ef46fbfc0d8d72fa6bd8f982e61 (patch) | |
| tree | 4103ae48b9e83464578fb70f39689f9074239f42 /install | |
| parent | cc7f9aa7a951d510973cd64711bd9eaa255a7fe3 (diff) | |
| download | freeipa-6bf90a472b408ef46fbfc0d8d72fa6bd8f982e61.tar.gz freeipa-6bf90a472b408ef46fbfc0d8d72fa6bd8f982e61.tar.xz freeipa-6bf90a472b408ef46fbfc0d8d72fa6bd8f982e61.zip | |
Removed 'Hide already enrolled' checkbox.
The 'Hide already enrolled' has been removed from the enrollment
dialog because it is checked by default and entries that are already
enrolled cannot be enrolled again.
Ticket #1638
Diffstat (limited to 'install')
| -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 |
3 files changed, 18 insertions, 37 deletions
diff --git a/install/ui/association.js b/install/ui/association.js index 2c6a1d20..37bc95fd 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 3513f0c1..45d30615 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 bd325505..7820e112 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.", |