IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Regression fix: missing control buttons in nested search facets

Browse Source 
Regression introduced by 6e90920233 - 'Move spec modifications from facet factories to pre_ops'.

https://fedorahosted.org/freeipa/ticket/3605
This commit is contained in:
Petr Vobornik
2013-05-29 10:12:44 +02:00
parent b1321e95d7
commit ec41744e76
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
install/ui/src/freeipa/search.js
View File

@@ -33,22 +33,7 @@ define([
var exp = {}; var exp = {};
exp.search_facet_pre_op = function(spec, context) { exp.search_facet_control_buttons_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;
spec.actions = spec.actions || []; spec.actions = spec.actions || [];
spec.actions.unshift( spec.actions.unshift(
@@ -83,7 +68,27 @@ exp.search_facet_pre_op = function(spec, context) {
spec.state.evaluators.push( spec.state.evaluators.push(
IPA.selected_state_evaluator, IPA.selected_state_evaluator,
IPA.self_service_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; return spec;
}; };
@@ -372,6 +377,7 @@ exp.nested_search_facet_preop = function(spec, context) {
var entity = context.entity; var entity = context.entity;
su.context_entity(spec, context); su.context_entity(spec, context);
spec.name = spec.name || 'search';
spec.title = spec.title || entity.metadata.label_singular; spec.title = spec.title || entity.metadata.label_singular;
spec.label = spec.label || entity.metadata.label; spec.label = spec.label || entity.metadata.label;
spec.tab_label = spec.tab_label || '@i18n:facets.search'; 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_breadcrumb = false;
spec.disable_facet_tabs = false; spec.disable_facet_tabs = false;
exp.search_facet_control_buttons_pre_op(spec, context);
return spec; return spec;
}; };