Author: raintang
Date: 2009-10-13 05:20:59 +0200 (Tue, 13 Oct 2009)
New Revision: 39079
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
Log:
CMSC-1559 Content Repository Search action shows results while nothing is
filled in at SearchInitAction; Stacktrace at searching elements first time
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-10-12 16:06:52 UTC (rev 39078)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-10-13 03:20:59 UTC (rev 39079)
@@ -1,6 +1,5 @@
package com.finalist.cmsc.repository.forms;
-import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -10,7 +9,6 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.LabelValueBean;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.NodeManager;
import org.mmbase.storage.search.SortOrder;
@@ -20,6 +18,7 @@
public class SearchInitAction extends MMBaseAction {
+ private static final String SEARCHOPTIONS = "searchoptions";
private static final String TITLE = "title";
private static final String TYPES_LIST = "typesList";
private static final String PORTLET_ID = "portletId";
@@ -56,7 +55,6 @@
if (searchForm.getDirection() != SortOrder.ORDER_DESCENDING) {
searchForm.setDirection(SortOrder.ORDER_ASCENDING);
}
- List<LabelValueBean> typesList = new ArrayList<LabelValueBean>();
List<NodeManager> types;
if(StringUtils.isEmpty(portletId)){
@@ -67,7 +65,7 @@
types = ContentElementUtil.getContentTypes(cloud);
}
}
- addToRequest(request,"typesList",
ContentElementUtil.getValidTypesList(cloud, types));
+ addToRequest(request,TYPES_LIST,
ContentElementUtil.getValidTypesList(cloud, types));
addToRequest(request, PORTLET_ID, portletId);
addToRequest(request, POSITION, position);
addToRequest(request, TITLE, searchForm.getTitle());
@@ -75,8 +73,7 @@
String originNodeId = request.getParameter(RELATIONORIGINNODE);
request.getSession().setAttribute(RELATIONORIGINNODE, originNodeId);
+ return mapping.findForward(SEARCHOPTIONS);
+}
- return mapping.findForward("dosearch");
- }
-
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-10-12 16:06:52 UTC (rev 39078)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-10-13 03:20:59 UTC (rev 39079)
@@ -98,7 +98,7 @@
<action path="/editors/repository/SearchInitAction"
type="com.finalist.cmsc.repository.forms.SearchInitAction"
name="SearchForm" scope="request" unknown="false" validate="false">
- <forward name="dosearch"
path="/editors/repository/ContentSearchAction.do" redirect="false" />
+ <forward name="searchoptions"
path="/editors/repository/contentsearch.jsp" redirect="false" />
</action>
<action path="/editors/repository/ContentSearchAction"
type="com.finalist.cmsc.repository.forms.ContentSearchAction"
name="SearchForm" scope="request"
input="/editors/repository/contentsearch.jsp" unknown="false" validate="true">
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
