Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms
In directory
james.mmbase.org:/tmp/cvs-serv32710/workflow/src/java/com/finalist/cmsc/workflow/forms
Modified Files:
LinkWorkflowAction.java AssetWorkflowAction.java
ContentWorkflowAction.java WorkflowAction.java
PageWorkflowAction.java
Added Files:
AllcontentWorkflowAction.java
Log Message:
CMSC-1087 -changes the status box of a page to a dynamic tree in the Workflow
section of the CMSc
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1087
AllcontentWorkflowAction.java is new
Index: LinkWorkflowAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/LinkWorkflowAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- LinkWorkflowAction.java 7 Dec 2007 10:42:41 -0000 1.6
+++ LinkWorkflowAction.java 18 Nov 2008 01:44:57 -0000 1.7
@@ -9,8 +9,13 @@
*/
package com.finalist.cmsc.workflow.forms;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
+import com.finalist.cmsc.workflow.AssetWorkflow;
import com.finalist.cmsc.workflow.LinkWorkflow;
import com.finalist.cmsc.workflow.WorkflowManager;
import com.finalist.cmsc.repository.RepositoryUtil;
@@ -46,4 +51,7 @@
return wfQuery;
}
+ @Override
+ protected void addAllcontentListToRequest(HttpServletRequest request, Cloud
cloud, String status, String laststatus) {
+ }
}
Index: AssetWorkflowAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/AssetWorkflowAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AssetWorkflowAction.java 10 Nov 2008 06:06:51 -0000 1.3
+++ AssetWorkflowAction.java 18 Nov 2008 01:44:57 -0000 1.4
@@ -9,6 +9,10 @@
*/
package com.finalist.cmsc.workflow.forms;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import com.finalist.cmsc.repository.AssetElementUtil;
@@ -60,4 +64,7 @@
return wfQuery;
}
+ @Override
+ protected void addAllcontentListToRequest(HttpServletRequest request, Cloud
cloud, String status, String laststatus) {
+ }
}
Index: ContentWorkflowAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/ContentWorkflowAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ContentWorkflowAction.java 26 Nov 2007 11:42:15 -0000 1.5
+++ ContentWorkflowAction.java 18 Nov 2008 01:44:57 -0000 1.6
@@ -9,6 +9,12 @@
*/
package com.finalist.cmsc.workflow.forms;
+
+import javax.servlet.http.HttpServletRequest;
+
+import jcifs.util.transport.Request;
+
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import com.finalist.cmsc.repository.ContentElementUtil;
@@ -60,4 +66,9 @@
return wfQuery;
}
+
+ @Override
+ protected void addAllcontentListToRequest(HttpServletRequest request, Cloud
cloud, String status, String laststatus) {
+ }
+
}
Index: WorkflowAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/WorkflowAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WorkflowAction.java 10 May 2008 16:31:48 -0000 1.7
+++ WorkflowAction.java 18 Nov 2008 01:44:57 -0000 1.8
@@ -19,6 +19,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.*;
+import org.mmbase.bridge.jsp.taglib.NodeListHelper;
import org.mmbase.bridge.util.Queries;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.*;
@@ -26,6 +27,7 @@
import com.finalist.cmsc.services.workflow.*;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
+import com.finalist.cmsc.workflow.RepositoryWorkflow;
import com.finalist.cmsc.workflow.WorkflowManager;
public abstract class WorkflowAction extends MMBaseFormlessAction {
@@ -95,11 +97,18 @@
status = statusStr;
}
- WorkflowStatusInfo ststusInfo = Workflow.getStatusInfo(cloud);
- request.setAttribute("statusInfo", ststusInfo);
+ WorkflowStatusInfo statusInfo = Workflow.getStatusInfo(cloud);
+ request.setAttribute("statusInfo", statusInfo);
String type = getWorkflowType();
addToRequest(request, "workflowType", type);
+ String nodetype = null;
+ String nodetypeStr = request.getParameter("workflowNodetype");
+ if (StringUtils.isNotEmpty(nodetypeStr)) {
+ nodetype = nodetypeStr;
+ addToRequest(request, "workflowNodetype", nodetype);
+ }
+ if(!RepositoryWorkflow.TYPE_ALLCONTENT.equals(type)){
NodeQuery listQuery = WorkflowManager.createListQuery(cloud);
Queries.addConstraint(listQuery,
WorkflowManager.getStatusConstraint(listQuery, status));
if (!Workflow.isAcceptedStepEnabled() &&
Workflow.STATUS_FINISHED.equals(status)) {
@@ -107,18 +116,28 @@
CompositeConstraint.LOGICAL_OR);
}
Queries.addConstraint(listQuery,
WorkflowManager.getTypeConstraint(listQuery, type));
+ if(!StringUtils.isBlank(nodetype)){
+ Queries.addConstraint(listQuery,
WorkflowManager.getNodetypeConstraint(listQuery, nodetype));
+ }
NodeQuery wfQuery = createDetailQuery(cloud, orderby, (laststatus ==
null) ? false : (laststatus.equals("true")));
-
addWorkflowListToRequest(request, cloud, wfQuery, listQuery, "results");
+ }else{
+ addAllcontentListToRequest(request, cloud, status, laststatus);
+ }
request.setAttribute("acceptedEnabled",
Workflow.isAcceptedStepEnabled());
HttpSession session = request.getSession();
session.setAttribute("workflow.type", type);
+ if(StringUtils.isNotEmpty(nodetype)){
+ session.setAttribute("workflow.nodetype", nodetype);
+ }
session.setAttribute("workflow.status", status);
return mapping.findForward(SUCCESS);
}
+ protected abstract void addAllcontentListToRequest(HttpServletRequest
request, Cloud cloud, String status, String laststatus);
+
protected abstract String getWorkflowType();
@@ -189,7 +208,7 @@
}
- private NodeQuery createDetailsWithNumbersQuery(NodeQuery wfQuery, NodeList
workflowNumbers) {
+ protected NodeQuery createDetailsWithNumbersQuery(NodeQuery wfQuery,
NodeList workflowNumbers) {
NodeQuery detailQuery = (NodeQuery) wfQuery.clone();
BasicStep wfStep = (BasicStep)
detailQuery.getStep(WorkflowManager.WORKFLOW_MANAGER_NAME);
Index: PageWorkflowAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/PageWorkflowAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PageWorkflowAction.java 7 Dec 2007 10:42:41 -0000 1.6
+++ PageWorkflowAction.java 18 Nov 2008 01:44:57 -0000 1.7
@@ -9,6 +9,9 @@
*/
package com.finalist.cmsc.workflow.forms;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.mmbase.bridge.*;
import com.finalist.cmsc.navigation.PagesUtil;
@@ -21,7 +24,6 @@
return PageWorkflow.TYPE_PAGE;
}
-
@Override
protected NodeQuery createDetailQuery(Cloud cloud, String orderby, boolean
aord) {
NodeManager manager = cloud.getNodeManager(PagesUtil.PAGE);
@@ -53,4 +55,7 @@
return wfQuery;
}
+ @Override
+ protected void addAllcontentListToRequest(HttpServletRequest request, Cloud
cloud, String status, String laststatus) {
+ }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
