diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js index 64a2926d9..03a358c60 100644 --- a/install/ui/src/freeipa/association.js +++ b/install/ui/src/freeipa/association.js @@ -406,7 +406,7 @@ IPA.association_table_widget = function (spec) { spec = spec || {}; - var index = spec.name.indexOf('_'); + var index = spec.name.lastIndexOf('_'); spec.attribute_member = spec.attribute_member || spec.name.substring(0, index); spec.other_entity = spec.other_entity || spec.name.substring(index+1); @@ -589,7 +589,7 @@ IPA.association_table_widget = function (spec) { var i; var columns = that.columns.values; if (columns.length == 1) { // show pkey only - var name = columns[0].name; + var name = columns[0].param; for (i=0; i