IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed 'Hide already enrolled' checkbox.

Browse Source 
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
This commit is contained in:
Endi S. Dewata 2011-08-17 14:54:08 -05:00
parent cc7f9aa7a9
commit 6bf90a472b
4 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
install/ui/association.js
View File

@ -176,28 +176,24 @@ IPA.association_adder_dialog = function (spec) {
}
}
var hide_checkbox = $('input[name=hidememb]', that.container);
var options = { all: true };
var relationships = IPA.metadata.objects[that.other_entity].relationships;
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';
/* 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 relationship = relationships[other_attribute_member];
if (relationship) {
var param_name = relationship[2] + that.entity.name;
options[param_name] = that.pkey;
}
IPA.command({

14
install/ui/dialog.js
View File

@ -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/>', {

1
install/ui/test/data/ipa_init.json
View File

@ -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.",

1
ipalib/plugins/internal.py
View File

@ -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."),