Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms
In directory
james.mmbase.org:/tmp/cvs-serv25729/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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- WorkflowAction.java 20 Jan 2009 06:30:25 -0000 1.13
+++ WorkflowAction.java 21 Jan 2009 06:52:42 -0000 1.14
@@ -112,7 +112,11 @@
String nodetype = null;
String nodetypeGUI = null;
String nodetypeStr = request.getParameter("workflowNodetype");
- if (StringUtils.isEmpty(nodetypeStr)) {
+ String fromIndex = request.getParameter("fromIndex");
+ if (fromIndex == null) {
+ fromIndex = "no";
+ }
+ if (StringUtils.isEmpty(nodetypeStr) &&
fromIndex.equalsIgnoreCase("yes")) {
nodetypeStr = (String)
request.getSession().getAttribute("workflowNodetype");
}
if (StringUtils.isNotEmpty(nodetypeStr)) {
@@ -146,11 +150,10 @@
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");
if (treeStatus == null) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
