diff --git a/install/ui/association.js b/install/ui/association.js
index ed274eb44..2fbdb7dde 100644
--- a/install/ui/association.js
+++ b/install/ui/association.js
@@ -998,8 +998,21 @@ IPA.association_facet = function (spec) {
dialog.open(that.container);
};
- that.get_pkeys = function(data) {
- return data.result.result[that.get_attribute_name()] || [];
+ that.get_records_map = function(data) {
+
+ var records_map = $.ordered_map();
+ var association_name = that.get_attribute_name();
+ var pkey_name = that.managed_entity.metadata.primary_key;
+
+ var pkeys = data.result.result[association_name];
+ for (var i=0; pkeys && i', {
href: '#'+key,
diff --git a/install/ui/facet.js b/install/ui/facet.js
index f0dbc1d42..d65024942 100644
--- a/install/ui/facet.js
+++ b/install/ui/facet.js
@@ -409,7 +409,8 @@ IPA.table_facet = function(spec) {
that.managed_entity = spec.managed_entity ? IPA.get_entity(spec.managed_entity) : that.entity;
that.pagination = spec.pagination === undefined ? true : spec.pagination;
- that.search_all = spec.search_all;
+ that.search_all_entries = spec.search_all_entries;
+ that.search_all_attributes = spec.search_all_attributes;
that.selectable = spec.selectable === undefined ? true : spec.selectable;
that.columns = $.ordered_map();
@@ -504,20 +505,30 @@ IPA.table_facet = function(spec) {
}
};
- that.get_pkeys = function(data) {
- return [];
+ that.get_records_map = function(data) {
+
+ var records_map = $.ordered_map();
+
+ var result = data.result.result;
+ var pkey_name = that.managed_entity.metadata.primary_key;
+
+ for (var i=0; i total ? total : end;
@@ -553,31 +562,37 @@ IPA.table_facet = function(spec) {
summary = summary.replace('${total}', total);
that.table.summary.text(summary);
- that.values = that.pkeys.slice(start-1, end);
+ // sort map based on primary keys
+ records_map = records_map.sort();
+
+ // trim map leaving the entries visible in the current page only
+ records_map = records_map.slice(start-1, end);
var columns = that.table.columns.values;
- if (columns.length == 1) { // show pkey only
- var name = columns[0].name;
- var records = [];
- for (var i=0; i