Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms
In directory
james.mmbase.org:/tmp/cvs-serv10578/workflow/src/java/com/finalist/cmsc/workflow/forms
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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- WorkflowAction.java 13 Jan 2009 05:10:43 -0000 1.11
+++ WorkflowAction.java 19 Jan 2009 12:30:50 -0000 1.12
@@ -114,10 +114,13 @@
String type = getWorkflowType();
addToRequest(request, "workflowType", type);
String nodetype = null;
+ String nodetypeGUI = null;
String nodetypeStr = request.getParameter("workflowNodetype");
if (StringUtils.isNotEmpty(nodetypeStr)) {
nodetype = nodetypeStr;
+ nodetypeGUI = cloud.getNodeManager(nodetype).getGUIName();
addToRequest(request, "workflowNodetype", nodetype);
+ addToRequest(request, "workflowNodetypeGUI", nodetypeGUI);
}
if(!RepositoryWorkflow.TYPE_ALLCONTENT.equals(type)){
@@ -139,9 +142,13 @@
request.setAttribute("acceptedEnabled",
Workflow.isAcceptedStepEnabled());
HttpSession session = request.getSession();
- session.setAttribute("workflow.type", type);
+ session.setAttribute("workflowType", type);
if(StringUtils.isNotEmpty(nodetype)){
- session.setAttribute("workflow.nodetype", nodetype);
+ session.setAttribute("workflowNodetype", nodetype);
+ session.setAttribute("workflowNodetypeGUI", nodetypeGUI);
+ }else{
+ session.removeAttribute("workflowNodetype");
+ session.removeAttribute("workflowNodetypeGUI");
}
session.setAttribute("workflow.status", status);
Map<String, Integer> treeStatus = (Map<String,
Integer>)session.getAttribute("workflowTreeStatus");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
