From 133b1327e2c6f78a2f8a6f482dbc9f6f66aace11 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Tue, 19 Jan 2016 18:23:51 +0100 Subject: [PATCH] webui: dislay server suffixes in server search page There was a change where suffixes in server are not longer returned as DNs but rather a cn of related topology suffix. I.e. they share "memberof" logic. This caused that search page doesn't get the data because it uses "no_member: true" option by default. This patch overrides the behavior because it is OK for server search page to fetch also member data - it is not so costly as e.g. in users. https://fedorahosted.org/freeipa/ticket/5609 Reviewed-By: Martin Babinsky --- install/ui/src/freeipa/facet.js | 12 +++++++++++- install/ui/src/freeipa/topology.js | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/install/ui/src/freeipa/facet.js b/install/ui/src/freeipa/facet.js index 3743794e7..9d71487c9 100644 --- a/install/ui/src/freeipa/facet.js +++ b/install/ui/src/freeipa/facet.js @@ -1828,6 +1828,16 @@ exp.table_facet = IPA.table_facet = function(spec, no_init) { */ that.search_all_entries = spec.search_all_entries; + /** + * Member resolution(no_member: true ) in rpc request is skipped by default + * to improve performance of getting data. + * + * Set always_request_members to true to skip this default behavior. + * @property {boolean} + */ + that.always_request_members = spec.always_request_members !== undefined ? + spec.always_request_members : false; + /** * Sort records */ @@ -2196,7 +2206,7 @@ exp.table_facet = IPA.table_facet = function(spec, no_init) { args: [pkey] }); - if (that.table.entity.has_members()) { + if (!that.always_request_members && that.table.entity.has_members()) { command.set_options({no_members: true}); } diff --git a/install/ui/src/freeipa/topology.js b/install/ui/src/freeipa/topology.js index 8e74918bf..6e67484cc 100644 --- a/install/ui/src/freeipa/topology.js +++ b/install/ui/src/freeipa/topology.js @@ -200,6 +200,7 @@ return { disable_facet_tabs: false, tabs_in_sidebar: true, tab_label: '@mo:server.label', + always_request_members: true, facet_groups: [topology.search_facet_group], facet_group: 'search', columns: [