Automount maps, keys and dnsrecord search facet are missing control
buttons (add, delete, refresh).
Regression introduced by 6e90920233cc9a7c9feb040dea22cda837715c39 -
'Move spec modifications from facet factories to pre_ops'.
https://fedorahosted.org/freeipa/ticket/3605
--
Petr Vobornik
From 12ec9a7b2aa394e43ad887bd4b5487069f814161 Mon Sep 17 00:00:00 2001
From: Petr Vobornik
Date: Wed, 29 May 2013 10:12:44 +0200
Subject: [PATCH] Regression fix: missing control buttons in nested search
facets
Regression introduced by 6e90920233cc9a7c9feb040dea22cda837715c39 - 'Move spec modifications from facet factories to pre_ops'.
https://fedorahosted.org/freeipa/ticket/3605
---
install/ui/src/freeipa/search.js | 40
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/install/ui/src/freeipa/search.js b/install/ui/src/freeipa/search.js
index e923316f6c9697167131c1eb5e0e1220f0576b44..03ec0b12adedb8c8ad0272f308e8dc7931da 100644
--- a/install/ui/src/freeipa/search.js
+++ b/install/ui/src/freeipa/search.js
@@ -33,22 +33,7 @@ define([
var exp = {};
-exp.search_facet_pre_op = function(spec, context) {
-
-var entity = context.entity;
-su.context_entity(spec, context);
-
-spec.name = spec.name || 'search';
-spec.title = spec.title || entity.metadata.label;
-spec.label = spec.label || entity.metadata.label;
-spec.tab_label = spec.tab_label || '@i18n:facets.search';
-
-spec.managed_entity = spec.managed_entity ? IPA.get_entity(spec.managed_entity) : spec.entity;
-
-spec.disable_breadcrumb =
-spec.disable_breadcrumb === undefined ? true : spec.disable_breadcrumb;
-spec.disable_facet_tabs =
-spec.disable_facet_tabs === undefined ? true : spec.disable_facet_tabs;
+exp.search_facet_control_buttons_pre_op = function(spec, context) {
spec.actions = spec.actions || [];
spec.actions.unshift(
@@ -83,7 +68,27 @@ exp.search_facet_pre_op = function(spec, context) {
spec.state.evaluators.push(
IPA.selected_state_evaluator,
IPA.self_service_state_evaluator);
+return spec;
+};
+exp.search_facet_pre_op = function(spec, context) {
+
+var entity = context.entity;
+su.context_entity(spec, context);
+
+spec.name = spec.name || 'search';
+spec.title = spec.title || entity.metadata.label;
+spec.label = spec.label || entity.metadata.label;
+spec.tab_label = spec.tab_label || '@i18n:facets.search';
+
+spec.managed_entity = spec.managed_entity ? IPA.get_entity(spec.managed_entity) : spec.entity;
+
+spec.disable_breadcrumb =
+spec.disable_breadcrumb === undefined ? true : spec.disable_breadcrumb;
+spec.disable_facet_tabs =
+spec.disable_facet_tabs === undefined ? true : spec.disable_facet_tabs;
+
+exp.search_facet_control_buttons_pre_op(spec, context);
return spec;
};
@@ -372,6 +377,7 @@ exp.nested_search_facet_preop = function(spec, context) {
var entity = context.entity;
su.context_entity(spec, context);
+spec.name = spec.name || 'search';
spec.title = spec.title || entity.metadata.label_singular;
spec.label = spec.label || entity.metadata.label;
spec.tab_label = spec.tab_label || '@i18n:facets.search';
@@ -380,6 +386,8 @@ exp.nested_search_facet_preop = function(spec, context) {
spec.disable_breadcrumb = false;
spec.disable_facet_tabs = false;
+
+exp.search_facet_control_buttons_pre_op(spec, context);
return spec;
};
--
1.8.1.4
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
