summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-08-17 14:54:08 -0500
committerEndi S. Dewata <edewata@redhat.com>2011-08-19 16:45:47 +0000
commit1603eb03f3196b2114813c85514832b3612a9bf6 (patch)
treef9e028d281649468268cb7209c9aa265bee92619
parent48eb95c5a47a8bfb036149981f3644b98e21dafa (diff)
downloadfreeipa-1603eb03f3196b2114813c85514832b3612a9bf6.zip
freeipa-1603eb03f3196b2114813c85514832b3612a9bf6.tar.gz
freeipa-1603eb03f3196b2114813c85514832b3612a9bf6.tar.xz
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
-rw-r--r--install/ui/association.js40
-rw-r--r--install/ui/dialog.js14
-rw-r--r--install/ui/test/data/ipa_init.json1
-rw-r--r--ipalib/plugins/internal.py1
4 files changed, 18 insertions, 38 deletions
diff --git a/install/ui/association.js b/install/ui/association.js
index 2c6a1d2..37bc95f 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 3513f0c..45d3061 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 bd32550..7820e11 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 84d8fd3..bffd7b5 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."),