Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow
In directory james.mmbase.org:/tmp/cvs-serv13652
Modified Files:
workflow.js workflow.jsp
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/webapp/editors/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1243
Index: workflow.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- workflow.js 1 Feb 2008 10:09:46 -0000 1.4
+++ workflow.js 23 Jan 2009 02:42:55 -0000 1.5
@@ -10,8 +10,9 @@
}
}
-function selectTab(val, orderby, laststatus) {
+function selectTab(val, workflowNodetype, orderby, laststatus) {
document.forms[0].orderby.value = orderby;
+ document.forms[0].workflowNodetype.value = workflowNodetype;
document.forms[0].status.value = val;
if(laststatus==null ||laststatus=="")
document.forms[0].laststatus.vlaue="true";
Index: workflow.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- workflow.jsp 20 Jan 2009 03:31:43 -0000 1.22
+++ workflow.jsp 23 Jan 2009 02:42:55 -0000 1.23
@@ -237,14 +237,14 @@
<div class="tabs" id="${status}">
<div class="<%=tabClass(pageContext,"draft")%>">
<div class="body">
- <div><a href="#" onclick="selectTab('draft');"><fmt:message
+ <div><a href="#"
onclick="selectTab('draft','${workflowNodetype}');"><fmt:message
key="workflow.tab.draft" /></a></div>
</div>
</div>
<div class="<%=tabClass(pageContext,"finished")%>">
<div class="body">
- <div><a href="#" onclick="selectTab('finished');"><fmt:message
+ <div><a href="#"
onclick="selectTab('finished','${workflowNodetype}');"><fmt:message
key="workflow.tab.finished" /></a></div>
</div>
</div>
@@ -252,14 +252,14 @@
<c:if test="${acceptedEnabled}">
<div class="<%=tabClass(pageContext,"approved")%>">
<div class="body">
- <div><a href="#"
onclick="selectTab('approved');"><fmt:message
+ <div><a href="#"
onclick="selectTab('approved','${workflowNodetype}');"><fmt:message
key="workflow.tab.approved" /></a></div>
</div>
</div>
</c:if>
<div class="<%=tabClass(pageContext,"published")%>">
<div class="body">
- <div><a href="#" onclick="selectTab('published');"><fmt:message
+ <div><a href="#"
onclick="selectTab('published','${workflowNodetype}');"><fmt:message
key="workflow.tab.published" /></a></div>
</div>
</div>
@@ -330,12 +330,14 @@
<div class="body" id="workflow-canvas"><c:set var="orderby"
value="${param.orderby}" />
<form action='?' method="post" onsubmit="return
submitValid(false);">
- <input type="hidden" name="orderby" value="${orderby}" /> <input
- type="hidden" name="status" value="${status}" /> <input
type="hidden"
- name="laststatus" /> <c:set var="lastvalue"
- value='<%=request.getAttribute("laststatus")%>' />
<c:set
- var="resultsPerPage" value="50" /> <c:set var="offset"
- value="${param.offset}" /> <c:set
var="listSize">${fn:length(nodeList)}</c:set>
+ <input type="hidden" name="orderby" value="${orderby}" />
+ <input type="hidden" name="status" value="${status}" />
+ <input type="hidden" name="laststatus" />
+ <input type="hidden" name="workflowNodetype"
value="${workflowNodetype}"/>
+ <c:set var="lastvalue" value='<%=request.getAttribute("laststatus")%>' />
+ <c:set var="resultsPerPage" value="50" />
+ <c:set var="offset" value="${param.offset}" />
+ <c:set var="listSize">${fn:length(nodeList)}</c:set>
<c:if test="${fn:length(results) > 0}">
<%@ include file="../pages.jsp"%>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
