summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--install/ui/association.js2
-rw-r--r--install/ui/dialog.js6
2 files changed, 6 insertions, 2 deletions
diff --git a/install/ui/association.js b/install/ui/association.js
index 83b7a3923..5b8a311ae 100644
--- a/install/ui/association.js
+++ b/install/ui/association.js
@@ -715,7 +715,7 @@ IPA.association_facet = function (spec) {
factory = IPA.column;
spec = { name: spec };
}
- spec.entity = that.entity;
+ spec.entity_name = that.other_entity;
column = factory(spec);
that.add_adder_column(column);
return column;
diff --git a/install/ui/dialog.js b/install/ui/dialog.js
index f4a8293bc..848252d87 100644
--- a/install/ui/dialog.js
+++ b/install/ui/dialog.js
@@ -369,6 +369,11 @@ IPA.adder_dialog = function (spec) {
}
that.create = function() {
+ /*TODO: move this earlier
+ The table initialization should be done earlier. However,
+ the adder columns are not added until after initialization is over,
+ and thus we have to dleay the creation of the table.*/
+ initialize_table();
// do not call that.dialog_create();
@@ -564,7 +569,6 @@ IPA.adder_dialog = function (spec) {
}
}
- initialize_table();
that.adder_dialog_create = that.create;