summaryrefslogtreecommitdiffstats
path: root/install/ui/association.js
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-09-26 13:44:22 -0500
committerEndi S. Dewata <edewata@redhat.com>2011-09-27 14:44:33 +0000
commitdf16d4aff73f95d3cdac4f0d3504e4c73e936789 (patch)
treeda758c295080476eef7897f20317705a41a5c2a5 /install/ui/association.js
parenta27a820221634fc0e0489a8c2dab3f0e914daa2c (diff)
downloadfreeipa-df16d4aff73f95d3cdac4f0d3504e4c73e936789.tar.gz
freeipa-df16d4aff73f95d3cdac4f0d3504e4c73e936789.tar.xz
freeipa-df16d4aff73f95d3cdac4f0d3504e4c73e936789.zip
Fixed duplicate entries in enrollment dialog.
The IPA.association_adder_dialog has been modified not to show search results that are already selected to prevent duplicates. Ticket #1859
Diffstat (limited to 'install/ui/association.js')
-rw-r--r--install/ui/association.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/install/ui/association.js b/install/ui/association.js
index 3d75072ae..47d8db173 100644
--- a/install/ui/association.js
+++ b/install/ui/association.js
@@ -177,14 +177,17 @@ IPA.association_adder_dialog = function(spec) {
var other_entity = IPA.get_entity(that.other_entity);
var pkey_attr = other_entity.metadata.primary_key;
+ var selected = that.get_selected_values();
+
var results = data.result;
for (var i=0; i<results.count; i++) {
var result = results.result[i];
var pkey = result[pkey_attr][0];
- if (that.exclude.indexOf(pkey) < 0) {
- that.add_available_value(result);
- }
+ if (that.exclude.indexOf(pkey) >= 0) continue;
+ if (selected.indexOf(pkey) >= 0) continue;
+
+ that.add_available_value(result);
}
}