summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorAdam Young <ayoung@redhat.com>2011-07-28 22:25:26 -0400
committerEndi S. Dewata <edewata@redhat.com>2011-07-29 14:28:56 +0000
commitbb45e51809756b7e56f2a3103e17b40a6dcf6ab0 (patch)
treeccc6e04afb42819053cc25e7eb1c2a3e93366d56 /install
parenta22d00234f94f825d5ff2b6af6e94ce11f98c753 (diff)
downloadfreeipa-bb45e51809756b7e56f2a3103e17b40a6dcf6ab0.zip
freeipa-bb45e51809756b7e56f2a3103e17b40a6dcf6ab0.tar.gz
freeipa-bb45e51809756b7e56f2a3103e17b40a6dcf6ab0.tar.xz
use other_entity for adder columns
delay creation of the table until the columns have been set https://fedorahosted.org/freeipa/ticket/1544
Diffstat (limited to 'install')
-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 83b7a39..5b8a311 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 f4a8293..848252d 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;