Author: raintang
Date: 2009-08-10 09:49:02 +0200 (Mon, 10 Aug 2009)
New Revision: 37629
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java
Log:
CMSC-1479 6 Based on the FD, implement create article page
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-10 06:51:33 UTC (rev 37628)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-10 07:49:02 UTC (rev 37629)
@@ -136,6 +136,7 @@
<a href="<mm:url page="../WizardInitAction.do">
<mm:param name="objectnumber"><mm:field
name="number" /></mm:param>
<mm:param name="returnurl" value="${returnurl}" />
+ <mm:param name="fromSE" value="true" />
</mm:url>">
<img src="../gfx/icons/page_edit.png"
alt="<fmt:message key="searchform.icon.edit.title" />" title="<fmt:message
key="searchform.icon.edit.title" />" /></a>
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-10 06:51:33 UTC (rev 37628)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-10 07:49:02 UTC (rev 37629)
@@ -78,6 +78,7 @@
<a href="<mm:url page="../WizardInitAction.do">
<mm:param name="objectnumber"><mm:field
name="number" /></mm:param>
<mm:param name="returnurl" value="${returnurl}" />
+ <mm:param name="fromSE" value="true" />
</mm:url>">
<img src="../gfx/icons/page_edit.png"
alt="<fmt:message key="searchform.icon.edit.title" />" title="<fmt:message
key="searchform.icon.edit.title" />" /></a>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
2009-08-10 06:51:33 UTC (rev 37628)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
2009-08-10 07:49:02 UTC (rev 37629)
@@ -70,6 +70,10 @@
&& Workflow.isWorkflowType(elementtype)) {
params.put("WORKFLOW", TRUE);
+ if (TRUE.equalsIgnoreCase((String)
request.getSession().getAttribute("fromSE"))) {
+ params.put("WORKFLOW", FALSE);
+ request.getSession().removeAttribute("fromSE");
+ }
params.put("WORKFLOW-ACCEPTED-ENABLED",
Boolean.toString(Workflow.isAcceptedStepEnabled()));
String activity = "DRAFT";
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java
2009-08-10 06:51:33 UTC (rev 37628)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java
2009-08-10 07:49:02 UTC (rev 37629)
@@ -140,6 +140,7 @@
log.debug("actionForward: " + actionForward);
actionForward += "&debug=true";
}
+ request.getSession().setAttribute("fromSE",
request.getParameter("fromSE"));
ActionForward ret = new ActionForward(actionForward);
ret.setRedirect(true);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
