Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow
In directory
james.mmbase.org:/tmp/cvs-serv10578/workflow/src/webapp/editors/workflow
Modified Files:
index.jsp 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: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/index.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- index.jsp 23 Dec 2008 07:41:00 -0000 1.3
+++ index.jsp 19 Jan 2009 12:30:53 -0000 1.4
@@ -1,7 +1,11 @@
<%
-String type = request.getParameter("workflow.type");
+String type = request.getParameter("workflowType");
if (type == null || "".equals(type)) {
- type = (String) session.getAttribute("workflow.type");
+ type = (String) session.getAttribute("workflowType");
+}
+String nodetype = request.getParameter("workflowNodetype");
+if (nodetype == null || "".equals(nodetype)) {
+ nodetype = (String) session.getAttribute("workflowNodetype");
}
String status = request.getParameter("workflow.status");
if (status == null || "".equals(status)) {
@@ -27,6 +31,9 @@
if (status != null && !"".equals(status)) {
redirectTo += "?status=" + status;
}
+if (nodetype != null && !"".equals(nodetype)) {
+ redirectTo += "&nodetype=" + nodetype;
+}
String offset = request.getParameter("offset");
Index: workflow.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- workflow.jsp 12 Jan 2009 06:34:28 -0000 1.20
+++ workflow.jsp 19 Jan 2009 12:30:53 -0000 1.21
@@ -113,74 +113,29 @@
<div id="tree-content-cont" <c:if test="${treeStatus.content eq
0}">style="display:none"</c:if>>
<table class="centerData">
<tbody>
+ <c:forEach var="contentType"
items="${statusInfo.contentChildTypes}" varStatus="itemStatus">
<tr>
- <td class="indent" />
- <td class="indent"><img
src="../utils/ajaxtree/images/I.png" /></td>
- <td class="indent"><img
src="../utils/ajaxtree/images/T.png" /></td>
- <td class="leftData"><fmt:message
-
key="workflow.status.content.article" /></td>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=article&status=draft">${statusInfo.contentArticleDraft}</a></td>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=article&status=finished">${statusInfo.contentArticleFinished}</a></td>
- <c:if test="${acceptedEnabled}">
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=article&status=approved">${statusInfo.contentArticleApproved}</a></td>
- </c:if>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=article&status=published">${statusInfo.contentArticlePublished}</a></td>
- </tr>
- <tr>
- <td class="indent" />
- <td class="indent"><img
src="../utils/ajaxtree/images/I.png" /></td>
- <td class="indent"><img
src="../utils/ajaxtree/images/T.png" /></td>
- <td class="leftData"><fmt:message
-
key="workflow.status.content.banners" /></td>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=banners&status=draft">${statusInfo.contentBannersDraft}</a></td>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=banners&status=finished">${statusInfo.contentBannersFinished}</a></td>
- <c:if test="${acceptedEnabled}">
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=banners&status=approved">${statusInfo.contentBannersApproved}</a></td>
- </c:if>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=banners&status=published">${statusInfo.contentBannersPublished}</a></td>
- </tr>
- <tr>
- <td class="indent" />
+ <td class="indent"/>
<td class="indent"><img
src="../utils/ajaxtree/images/I.png" /></td>
+ <c:if test="${not itemStatus.last}">
<td class="indent"><img
src="../utils/ajaxtree/images/T.png" /></td>
- <td class="leftData"><fmt:message
-
key="workflow.status.content.link" /></td>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=link&status=draft">${statusInfo.contentLinkDraft}</a></td>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=link&status=finished">${statusInfo.contentLinkFinished}</a></td>
- <c:if test="${acceptedEnabled}">
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=link&status=approved">${statusInfo.contentLinkApproved}</a></td>
</c:if>
- <td><a
-
href="ContentWorkflowAction.do?workflowNodetype=link&status=published">${statusInfo.contentLinkPublished}</a></td>
- </tr>
- <tr>
- <td class="indent" />
- <td class="indent"><img
src="../utils/ajaxtree/images/I.png" /></td>
+ <c:if test="${itemStatus.last}">
<td class="indent"><img
src="../utils/ajaxtree/images/L.png" /></td>
- <td class="leftData"><fmt:message
-
key="workflow.status.content.faqitem" /></td>
+ </c:if>
+ <td
class="leftData">${contentType.label}</td>
<td><a
-
href="ContentWorkflowAction.do?workflowNodetype=faqitem&status=draft">${statusInfo.contentFaqitemDraft}</a></td>
+
href="ContentWorkflowAction.do?workflowNodetype=${contentType.value}&status=draft">${statusInfo.contentChildrenDraft[contentType.value]}</a></td>
<td><a
-
href="ContentWorkflowAction.do?workflowNodetype=faqitem&status=finished">${statusInfo.contentFaqitemFinished}</a></td>
+
href="ContentWorkflowAction.do?workflowNodetype=${contentType.value}&status=finished">${statusInfo.contentChildrenFinished[contentType.value]}</a></td>
<c:if test="${acceptedEnabled}">
<td><a
-
href="ContentWorkflowAction.do?workflowNodetype=faqitem&status=approved">${statusInfo.contentFaqitemApproved}</a></td>
+
href="ContentWorkflowAction.do?workflowNodetype=${contentType.value}&status=approved">${statusInfo.contentChildrenApproved[contentType.value]}</a></td>
</c:if>
<td><a
-
href="ContentWorkflowAction.do?workflowNodetype=faqitem&status=published">${statusInfo.contentFaqitemPublished}</a></td>
+
href="ContentWorkflowAction.do?workflowNodetype=${contentType.value}&status=published">${statusInfo.contentChildrenPublished[contentType.value]}</a></td>
</tr>
+ </c:forEach>
</tbody>
</table>
</div>
@@ -208,57 +163,29 @@
<div id="tree-asset-cont" <c:if test="${treeStatus.asset eq
0}">style="display:none"</c:if> >
<table class="centerData">
<tbody>
+ <c:forEach var="assetType" items="${statusInfo.assetChildTypes}"
varStatus="itemStatus">
<tr>
+ <td class="indent"/>
<td class="indent" />
- <td class="indent" />
+ <c:if test="${not itemStatus.last}">
<td class="indent"><img
src="../utils/ajaxtree/images/T.png" /></td>
- <td class="leftData"><fmt:message
-
key="workflow.status.asset.images" /></td>
- <td><a
-
href="AssetWorkflowAction.do?workflowNodetype=images&status=draft">${statusInfo.assetImagesDraft}</a></td>
- <td><a
-
href="AssetWorkflowAction.do?workflowNodetype=images&status=finished">${statusInfo.assetImagesFinished}</a></td>
- <c:if test="${acceptedEnabled}">
- <td><a
-
href="AssetWorkflowAction.do?workflowNodetype=images&status=approved">${statusInfo.assetImagesApproved}</a></td>
</c:if>
- <td><a
-
href="AssetWorkflowAction.do?workflowNodetype=images&status=published">${statusInfo.assetImagesPublished}</a></td>
- </tr>
- <tr>
- <td class="indent" />
- <td class="indent" />
- <td class="indent"><img
src="../utils/ajaxtree/images/T.png" /></td>
- <td class="leftData"><fmt:message
-
key="workflow.status.asset.attachments" /></td>
- <td><a
-
href="AssetWorkflowAction.do?workflowNodetype=attachments&status=draft">${statusInfo.assetAttachmentsDraft}</a></td>
- <td><a
-
href="AssetWorkflowAction.do?workflowNodetype=attachments&status=finished">${statusInfo.assetAttachmentsFinished}</a></td>
- <c:if test="${acceptedEnabled}">
- <td><a
-
href="AssetWorkflowAction.do?workflowNodetype=attachments&status=approved">${statusInfo.assetAttachmentsApproved}</a></td>
- </c:if>
- <td><a
-
href="AssetWorkflowAction.do?workflowNodetype=attachments&status=published">${statusInfo.assetAttachmentsPublished}</a></td>
- </tr>
- <tr>
- <td class="indent" />
- <td class="indent" />
+ <c:if test="${itemStatus.last}">
<td class="indent"><img
src="../utils/ajaxtree/images/L.png" /></td>
- <td class="leftData"><fmt:message
-
key="workflow.status.asset.urls" /></td>
+ </c:if>
+ <td class="leftData">${assetType.label}</td>
<td><a
-
href="AssetWorkflowAction.do?workflowNodetype=urls&status=draft">${statusInfo.assetUrlsDraft}</a></td>
+
href="ContentWorkflowAction.do?workflowNodetype=${assetType.value}&status=draft">${statusInfo.assetChildrenDraft[assetType.value]}</a></td>
<td><a
-
href="AssetWorkflowAction.do?workflowNodetype=urls&status=finished">${statusInfo.assetUrlsFinished}</a></td>
+
href="ContentWorkflowAction.do?workflowNodetype=${assetType.value}&status=finished">${statusInfo.assetChildrenFinished[assetType.value]}</a></td>
<c:if test="${acceptedEnabled}">
<td><a
-
href="AssetWorkflowAction.do?workflowNodetype=urls&status=approved">${statusInfo.assetUrlsApproved}</a></td>
+
href="ContentWorkflowAction.do?workflowNodetype=${assetType.value}&status=approved">${statusInfo.assetChildrenApproved[assetType.value]}</a></td>
</c:if>
<td><a
-
href="AssetWorkflowAction.do?workflowNodetype=urls&status=published">${statusInfo.assetUrlsPublished}</a></td>
+
href="ContentWorkflowAction.do?workflowNodetype=${assetType.value}&status=published">${statusInfo.assetChildrenPublished[assetType.value]}</a></td>
</tr>
+ </c:forEach>
</tbody>
</table>
</div>
@@ -388,47 +315,14 @@
</c:if>
<div class="ruler_green">
- <div> <c:if test="${workflowType == 'allcontent' }">
- <fmt:message key="workflow.title.allcontent" />
- </c:if><c:if test="${workflowType == 'content' }">
- <c:choose>
- <c:when test="${workflowNodetype == 'article'
}">
- <fmt:message
key="workflow.title.content.article" />
- </c:when>
- <c:when test="${workflowNodetype == 'banners'
}">
- <fmt:message
key="workflow.title.content.banners" />
- </c:when>
- <c:when test="${workflowNodetype == 'link' }">
- <fmt:message
key="workflow.title.content.link" />
- </c:when>
- <c:when test="${workflowNodetype == 'faqitem'
}">
- <fmt:message
key="workflow.title.content.faqitem" />
- </c:when>
- <c:otherwise>
- <fmt:message
key="workflow.title.content" />
- </c:otherwise>
- </c:choose>
-
- </c:if> <c:if test="${workflowType == 'asset' }">
- <c:choose>
- <c:when test="${workflowNodetype == 'images' }">
- <fmt:message
key="workflow.title.asset.images" />
- </c:when>
- <c:when test="${workflowNodetype ==
'attachments' }">
- <fmt:message
key="workflow.title.asset.attachments" />
- </c:when>
- <c:when test="${workflowNodetype == 'urls' }">
- <fmt:message
key="workflow.title.asset.urls" />
- </c:when>
- <c:otherwise>
- <fmt:message key="workflow.title.asset"
/>
- </c:otherwise>
- </c:choose>
- </c:if> <c:if test="${workflowType == 'link' }">
- <fmt:message key="workflow.title.link" />
- </c:if> <c:if test="${workflowType == 'page' }">
- <fmt:message key="workflow.title.page" />
- </c:if></div>
+ <div>
+ <c:if test="${not empty workflowType and empty
workflowNodetype}">
+ <fmt:message key="workflow.title.${workflowType}" />
+ </c:if>
+ <c:if test="${not empty workflowType and not empty
workflowNodetype and not empty workflowNodetypeGUI}">
+ ${workflowNodetypeGUI}
+ </c:if>
+ </div>
</div>
<div class="body" style="display: none;"
id="workflow-wait"><fmt:message
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
