LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Advanced Search lässt sich wieder aufrufen. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1612 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-04-24 09:55:37 +00:00
parent ae8f7d1999
commit f78f3adc18
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/src/com/arsdigita/cms/ui/search/ContentTypeFilterWidget.java
View File

@ -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));

5
ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java
View File

@ -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;
}

6
ccm-ldn-search/src/com/arsdigita/london/search/ui/SearchComponent.java
View File

@ -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);
*/