Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms
In directory james.mmbase.org:/tmp/cvs-serv4221
Modified Files:
WorkflowAction.java
Log Message:
CMSC-1243 List Summary for "All content" should contain the proper content types
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-1243
Index: WorkflowAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/WorkflowAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- WorkflowAction.java 19 Jan 2009 12:30:50 -0000 1.12
+++ WorkflowAction.java 20 Jan 2009 06:30:25 -0000 1.13
@@ -1,11 +1,9 @@
/*
-
- This software is OSI Certified Open Source Software.
- OSI Certified is a certification mark of the Open Source Initiative.
-
- The license (Mozilla version 1.0) can be read at the MMBase site.
- See http://www.MMBase.org/license
-
+ *
+ * This software is OSI Certified Open Source Software. OSI Certified is a
certification mark of the Open Source
+ * Initiative.
+ *
+ * The license (Mozilla version 1.0) can be read at the MMBase site. See
http://www.MMBase.org/license
*/
package com.finalist.cmsc.workflow.forms;
@@ -56,7 +54,6 @@
private static final Object REMARK_UNCHANGED = "[unchanged-item]";
-
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
String actionValueStr = request.getParameter("actionvalue");
@@ -98,8 +95,7 @@
String laststatus = request.getParameter("laststatus");
if (StringUtils.isEmpty(laststatus) || laststatus == null) {
request.setAttribute("laststatus", true);
- }
- else {
+ } else {
request.setAttribute("laststatus", laststatus.equals("true") ? false
: true);
}
@@ -116,6 +112,9 @@
String nodetype = null;
String nodetypeGUI = null;
String nodetypeStr = request.getParameter("workflowNodetype");
+ if (StringUtils.isEmpty(nodetypeStr)) {
+ nodetypeStr = (String)
request.getSession().getAttribute("workflowNodetype");
+ }
if (StringUtils.isNotEmpty(nodetypeStr)) {
nodetype = nodetypeStr;
nodetypeGUI = cloud.getNodeManager(nodetype).getGUIName();
@@ -123,35 +122,37 @@
addToRequest(request, "workflowNodetypeGUI", nodetypeGUI);
}
- if(!RepositoryWorkflow.TYPE_ALLCONTENT.equals(type)){
+ 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)) {
- SearchUtil.addConstraint(listQuery,
WorkflowManager.getStatusConstraint(listQuery, Workflow.STATUS_APPROVED),
- CompositeConstraint.LOGICAL_OR);
+ SearchUtil.addConstraint(listQuery, WorkflowManager
+ .getStatusConstraint(listQuery, Workflow.STATUS_APPROVED),
CompositeConstraint.LOGICAL_OR);
}
Queries.addConstraint(listQuery,
WorkflowManager.getTypeConstraint(listQuery, type));
- if(!StringUtils.isBlank(nodetype)){
+ if (!StringUtils.isBlank(nodetype)) {
WorkflowManager.addNodetypeConstraint(cloud, listQuery, nodetype);
}
- NodeQuery wfQuery = createDetailQuery(cloud, orderby, (laststatus ==
null) ? false : (laststatus.equals("true")));
+ NodeQuery wfQuery = createDetailQuery(cloud, orderby, (laststatus ==
null) ? false : (laststatus
+ .equals("true")));
addWorkflowListToRequest(request, cloud, wfQuery, listQuery,
"results");
- }else{
+ } else {
addAllcontentListToRequest(request, cloud, status, laststatus);
}
request.setAttribute("acceptedEnabled",
Workflow.isAcceptedStepEnabled());
HttpSession session = request.getSession();
session.setAttribute("workflowType", type);
- if(StringUtils.isNotEmpty(nodetype)){
+ if (StringUtils.isNotEmpty(nodetype)) {
session.setAttribute("workflowNodetype", nodetype);
session.setAttribute("workflowNodetypeGUI", nodetypeGUI);
- }else{
- session.removeAttribute("workflowNodetype");
- session.removeAttribute("workflowNodetypeGUI");
}
+ // else{
+ // session.removeAttribute("workflowNodetype");
+ // session.removeAttribute("workflowNodetypeGUI");
+ // }
session.setAttribute("workflow.status", status);
- Map<String, Integer> treeStatus = (Map<String,
Integer>)session.getAttribute("workflowTreeStatus");
+ Map<String, Integer> treeStatus = (Map<String, Integer>)
session.getAttribute("workflowTreeStatus");
if (treeStatus == null) {
treeStatus = new HashMap<String, Integer>();
treeStatus.put("allcontent", 1);
@@ -162,15 +163,13 @@
return mapping.findForward(SUCCESS);
}
-
- protected abstract void addAllcontentListToRequest(HttpServletRequest
request, Cloud cloud, String status, String laststatus);
+ protected abstract void addAllcontentListToRequest(HttpServletRequest
request, Cloud cloud, String status,
+ String laststatus);
protected abstract String getWorkflowType();
-
protected abstract NodeQuery createDetailQuery(Cloud cloud, String orderby,
boolean AorD);
-
protected List<Node> performWorkflowAction(String action, List<Node> nodes,
String remark) {
List<Node> errors = new ArrayList<Node>();
@@ -210,12 +209,10 @@
try {
if (publishNumbers.contains(publishNode.getNumber())) {
Workflow.publish(publishNode, publishNumbers);
- }
- else {
+ } else {
Workflow.accept(publishNode, "");
}
- }
- catch (WorkflowException wfe) {
+ } catch (WorkflowException wfe) {
errors.addAll(wfe.getErrors());
}
}
@@ -223,7 +220,6 @@
return errors;
}
-
private void addWorkflowListToRequest(HttpServletRequest request, Cloud
cloud, NodeQuery detailQuery,
NodeQuery listQuery, String attributeName) {
NodeList ceWorkflowNumbers = cloud.getList(listQuery);
@@ -234,7 +230,6 @@
}
}
-
protected NodeQuery createDetailsWithNumbersQuery(NodeQuery wfQuery,
NodeList workflowNumbers) {
NodeQuery detailQuery = (NodeQuery) wfQuery.clone();
@@ -249,21 +244,17 @@
return detailQuery;
}
-
protected void addOrderBy(NodeManager manager, NodeQuery query, String
fieldname, boolean aord) {
Step step = query.getStep(manager.getName());
StepField sf = query.createStepField(step, manager.getField(fieldname));
if (aord) {
/*
- * System.out.println("WorkflowAction : orderby-- " + fieldname + "
- * descending");
+ * System.out.println("WorkflowAction : orderby-- " + fieldname + "
descending");
*/
query.addSortOrder(sf, SortOrder.ORDER_DESCENDING);
- }
- else {
+ } else {
/*
- * System.out.println("WorkflowAction : orderby-- " + fieldname + "
- * ascending");
+ * System.out.println("WorkflowAction : orderby-- " + fieldname + "
ascending");
*/
query.addSortOrder(sf, SortOrder.ORDER_ASCENDING);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
