From f78f3adc18adc4c21325b53e4b98779c43a23579 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 24 Apr 2012 09:55:37 +0000 Subject: [PATCH] =?UTF-8?q?Advanced=20Search=20l=C3=A4sst=20sich=20wieder?= =?UTF-8?q?=20aufrufen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1612 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/ui/search/ContentTypeFilterWidget.java | 2 +- .../arsdigita/london/search/ui/AdvancedQueryComponent.java | 5 ++++- .../src/com/arsdigita/london/search/ui/SearchComponent.java | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ui/search/ContentTypeFilterWidget.java b/ccm-cms/src/com/arsdigita/cms/ui/search/ContentTypeFilterWidget.java index 63340ddf9..353e5d454 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/search/ContentTypeFilterWidget.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/search/ContentTypeFilterWidget.java @@ -83,7 +83,7 @@ public class ContentTypeFilterWidget extends FilterWidget { private ContentType getParentType(PageState state) { ContentType ct = m_parentType; - + BigDecimal singleTypeID = (BigDecimal) state.getValue(new BigDecimalParameter( ItemSearch.SINGLE_TYPE_PARAM)); diff --git a/ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java b/ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java index 381ae297a..ed533b700 100755 --- a/ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java +++ b/ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java @@ -22,9 +22,11 @@ import com.arsdigita.bebop.Form; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormModel; import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.parameters.BigDecimalParameter; import com.arsdigita.bebop.parameters.ParameterData; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.categorization.Category; +import com.arsdigita.cms.ui.ItemSearch; import com.arsdigita.cms.ui.search.ContentTypeFilterWidget; import com.arsdigita.cms.ui.search.VersionFilterComponent; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; @@ -76,10 +78,11 @@ public class AdvancedQueryComponent extends BaseQueryComponent { } } + @Override public void register(Form form, FormModel model) { s_log.debug("Adding " + m_hiddenAllowedContentSectionsList.getName() + " to form model"); m_hiddenAllowedContentSectionsList.setPassIn(true); - model.addFormParam(m_hiddenAllowedContentSectionsList); + model.addFormParam(m_hiddenAllowedContentSectionsList); super.register(form, model); m_form = form; } diff --git a/ccm-ldn-search/src/com/arsdigita/london/search/ui/SearchComponent.java b/ccm-ldn-search/src/com/arsdigita/london/search/ui/SearchComponent.java index cafa94508..5b925ec40 100755 --- a/ccm-ldn-search/src/com/arsdigita/london/search/ui/SearchComponent.java +++ b/ccm-ldn-search/src/com/arsdigita/london/search/ui/SearchComponent.java @@ -24,6 +24,8 @@ import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.Page; import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.parameters.BigDecimalParameter; +import com.arsdigita.cms.ui.ItemSearch; import com.arsdigita.search.ui.QueryComponent; import com.arsdigita.search.ui.ResultsPane; @@ -51,7 +53,7 @@ public class SearchComponent extends SimpleContainer { m_results = new ResultsPane(query, engine); - add(m_form); + add(m_form); if (Search.getConfig().getShowSponsoredLinks().booleanValue()) { m_links = new SponsoredLinksComponent(m_query); @@ -69,8 +71,10 @@ public class SearchComponent extends SimpleContainer { */ } + @Override public void register(Page p) { super.register(p); + p.addGlobalStateParam(new BigDecimalParameter(ItemSearch.SINGLE_TYPE_PARAM)); /* p.setVisibleDefault(m_results, false); */