Author: billyxie
Date: 2009-08-07 05:36:37 +0200 (Fri, 07 Aug 2009)
New Revision: 37585
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
Log:
CMSC-1478 - 5 Based on the FD, implement search filter function
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-07 02:50:55 UTC (rev 37584)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-07 03:36:37 UTC (rev 37585)
@@ -8,6 +8,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.mmapps.commons.util.StringUtil;
+
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -45,6 +47,11 @@
log.debug("Starting the simple editor");
SimpleContentActionForm simpleContentForm = (SimpleContentActionForm)
form;
+ if(StringUtil.isEmptyOrWhitespace(request.getParameter("title"))){
+ simpleContentForm.setTitle("");
+ } else {
+ simpleContentForm.setTitle(request.getParameter("title"));
+ }
int resultCount = 0;
NodeList results = cloud.createNodeList();
NodeManager nodeManager =
cloud.getNodeManager(SimpleContentUtil.CONTENT_TYPE);
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-07 02:50:55 UTC (rev 37584)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-07 03:36:37 UTC (rev 37585)
@@ -67,6 +67,8 @@
</div>
<div class="ruler_green"><div><fmt:message key="simple.editor.draft"
/></div></div>
+<form action="SimpleContentDraftAction.do" name="SimpleContentForm">
+<input style="margin-left:10px;margin-top:10px" type="text"
name="title"><input type="submit" class="button" value="<fmt:message
key="simple.editor.search" />">
<!-- we check to see if we have workflow, this is done by looking if the
editors for the workflow are on the HD -->
<c:set var="hasWorkflow" value="false"/>
<mm:haspage page="/editors/workflow">
@@ -84,8 +86,6 @@
<mm:list referid="results">
<mm:first>
<edit:pages search="true" totalElements="${resultCount}"
offset="${param.offset}"/>
- <form action="SimpleContentDraftAction.do" name="SimpleContentForm">
- <input style="margin-left:10px;margin-top:10px" type="text"
name="title"><input type="button" class="button" value="<fmt:message
key="simple.editor.search" />">
<table>
<thead>
<tr>
@@ -180,8 +180,8 @@
<mm:last>
</tbody>
</table>
- </form>
<edit:pages search="true" totalElements="${resultCount}"
offset="${param.offset}"/>
</mm:last>
</mm:list>
</div>
+</form>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-07 02:50:55 UTC (rev 37584)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-07 03:36:37 UTC (rev 37585)
@@ -18,6 +18,8 @@
</div>
<div class="ruler_green"><div><fmt:message key="simple.editor.ready"
/></div></div>
+<form action="SimpleContentReadyAction.do" name="SimpleContentForm">
+<input style="margin-left:10px;margin-top:10px" type="text"
name="title"><input type="submit" class="button" value="<fmt:message
key="simple.editor.search" />">
<!-- we check to see if we have workflow, this is done by looking if the
editors for the workflow are on the HD -->
<c:set var="hasWorkflow" value="false"/>
<mm:haspage page="/editors/workflow">
@@ -35,8 +37,6 @@
<mm:list referid="results">
<mm:first>
<edit:pages search="true" totalElements="${resultCount}"
offset="${param.offset}"/>
- <form action="SimpleContentReadyAction.do" name="SimpleContentForm">
- <input style="margin-left:10px;margin-top:10px" type="text"
name="title"><input type="button" class="button" value="<fmt:message
key="simple.editor.search" />">
<table>
<thead>
<tr>
@@ -124,9 +124,9 @@
<mm:last>
</tbody>
</table>
- </form>
<edit:pages search="true" totalElements="${resultCount}"
offset="${param.offset}"/>
</mm:last>
</mm:list>
</div>
+</form>
\ No newline at end of file
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
