Author: billyxie
Date: 2009-08-06 13:17:24 +0200 (Thu, 06 Aug 2009)
New Revision: 37557
Added:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Added:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
2009-08-06 11:17:24 UTC (rev 37557)
@@ -0,0 +1,38 @@
+/**
+ *
+ */
+package com.finalist.cmsc.repository.forms;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sf.mmapps.commons.util.StringUtil;
+
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.mmbase.bridge.Cloud;
+
+import com.finalist.cmsc.services.workflow.Workflow;
+import com.finalist.cmsc.struts.MMBaseFormlessAction;
+
+
+/**
+ * @author Billy
+ *
+ */
+public class SimpleContentWorkflowAction extends MMBaseFormlessAction {
+
+ /* (non-Javadoc)
+ * @see
com.finalist.cmsc.struts.MMBaseFormlessAction#execute(org.apache.struts.action.ActionMapping,
javax.servlet.http.HttpServletRequest, org.mmbase.bridge.Cloud)
+ */
+ @Override
+ public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud)
+ throws Exception {
+ String content = request.getParameter("content");
+ if(!StringUtil.isEmptyOrWhitespace(content)){
+ Workflow.finish(cloud.getNode(content), "");
+ }
+
+ return mapping.findForward(SUCCESS);
+ }
+
+}
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-08-06 10:08:15 UTC (rev 37556)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-08-06 11:17:24 UTC (rev 37557)
@@ -310,6 +310,10 @@
unknown="false" validate="false">
<forward name="success" path="/editors/simple/channellist.jsp"
redirect="false" />
</action>
+ <action path="/editors/simple/SimpleContentWorkflowAction"
type="com.finalist.cmsc.repository.forms.SimpleContentWorkflowAction"
+ unknown="false" validate="false" >
+ <forward name="success"
path="/editors/simple/SimpleContentInitAction.do" redirect="false" />
+ </action>
</action-mappings>
<message-resources parameter="cmsc-repository" key="REPOSITORY" />
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-06 10:08:15 UTC (rev 37556)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-06 11:17:24 UTC (rev 37557)
@@ -133,7 +133,9 @@
<a href="<cmsc:contenturl number="${nodenumber}"/>"
target="_blank"><img src="../gfx/icons/preview.png" alt="<fmt:message
key="searchform.icon.preview.title" />" title="<fmt:message
key="searchform.icon.preview.title" />" /></a>
</mm:field>
<c:if test="${hasWorkflow}">
- <a href="#" onclick="showItem(<mm:field
name="number"/>);"><img src="../gfx/icons/status_finished.png"
alt="<fmt:message key="searchform.icon.info.title" />" title="<fmt:message
key="searchform.icon.info.title" />" /></a>
+ <a href="<mm:url
page="../simple/SimpleContentWorkflowAction.do">
+ <mm:param name="content"><mm:field
name="number"/></mm:param>
+ </mm:url>" ><img src="../gfx/icons/status_finished.png"
alt="<fmt:message key="searchform.icon.info.title" />" title="<fmt:message
key="searchform.icon.info.title" />" /></a>
</c:if>
<a onclick="moveContent(<mm:field
name="number"/>, ${channelNumber} )" target="selectchannel" href="<mm:url
page="../simple/SimpleEditorChannelAction.do">
<mm:param name="content"><mm:field
name="number"/></mm:param>
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-06 10:08:15 UTC (rev 37556)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-06 11:17:24 UTC (rev 37557)
@@ -84,9 +84,6 @@
<mm:field name="number" write="false" id="nodenumber">
<a href="<cmsc:contenturl number="${nodenumber}"/>"
target="_blank"><img src="../gfx/icons/preview.png" alt="<fmt:message
key="searchform.icon.preview.title" />" title="<fmt:message
key="searchform.icon.preview.title" />" /></a>
</mm:field>
- <c:if test="${hasWorkflow}">
- <a href="#" onclick="showItem(<mm:field
name="number"/>);"><img src="../gfx/icons/status_finished.png"
alt="<fmt:message key="searchform.icon.info.title" />" title="<fmt:message
key="searchform.icon.info.title" />" /></a>
- </c:if>
<a onclick="moveContent(<mm:field
name="number"/>, ${channelNumber} )" target="selectchannel" href="<mm:url
page="../simple/SimpleEditorChannelAction.do">
<mm:param name="content"><mm:field
name="number"/></mm:param>
</mm:url>" >
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
