From e6e96861dc97a00e5e8365cfab41c4e637a17167 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvoborni@redhat.com>
Date: Jun 13 2013 15:48:03 +0000
Subject: Regression fix: rule table with ext. member support doesn't offer any items


There is a JS error.

Rule tables with external member has more than one column and therefore exclude parameter for adder dialog is not array of strings but array of objects. normalize_values function can't work with it and causes JS error.

This patch creates proper exclude array before passing it to adder dialog.

https://fedorahosted.org/freeipa/ticket/3711

---

diff --git a/install/ui/src/freeipa/rule.js b/install/ui/src/freeipa/rule.js
index 959aec4..f573b56 100644
--- a/install/ui/src/freeipa/rule.js
+++ b/install/ui/src/freeipa/rule.js
@@ -149,6 +149,14 @@ IPA.rule_association_table_widget = function(spec) {
         title = title.replace('${primary_key}', pkey);
         title = title.replace('${other_entity}', other_entity_label);
 
+        var exclude = that.values;
+        if (that.external) {
+            exclude = [];
+            for (var i=0; i<that.values.length; i++) {
+                exclude.push(that.values[i][that.name]);
+            }
+        }
+
         return IPA.rule_association_adder_dialog({
             title: title,
             pkey: pkey,
@@ -156,7 +164,7 @@ IPA.rule_association_table_widget = function(spec) {
             attribute_member: that.attribute_member,
             entity: that.entity,
             external: that.external,
-            exclude: that.values
+            exclude: exclude
         });
     };