Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow
In directory
james.mmbase.org:/tmp/cvs-serv15537/CMSContainer_Modules/workflow/src/webapp/editors/workflow
Modified Files:
workflow.jsp workflow_list_table_fragment.jsp
Log Message:
CMSC-1243 Assets: 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.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- workflow.jsp 23 Jan 2009 02:42:55 -0000 1.23
+++ workflow.jsp 2 Feb 2009 06:22:12 -0000 1.24
@@ -91,6 +91,8 @@
<div id="tree-content">
<table class="centerData">
<tbody>
+<%-- <c:if test="${ statusInfo.contentDraft != 0 ||
statusInfo.contentFinished != 0 || statusInfo.contentApproved != 0 ||
statusInfo.contentPublished != 0}">
+--%>
<tr>
<td class="indent" />
<td class="indent"><img
id="tree-content-plus"
@@ -107,6 +109,8 @@
</c:if>
<td><a
href="ContentWorkflowAction.do?status=published">${statusInfo.contentPublished}</a></td>
</tr>
+<%-- </c:if>
+--%>
</tbody>
</table>
</div>
@@ -114,6 +118,8 @@
<table class="centerData">
<tbody>
<c:forEach var="contentType"
items="${statusInfo.contentChildTypes}" varStatus="itemStatus">
+ <c:if test="${
statusInfo.contentChildrenDraft[contentType.value] != 0 ||
statusInfo.contentChildrenFinished[contentType.value] != 0
+ ||
statusInfo.contentChildrenApproved[contentType.value]!=0 ||
statusInfo.contentChildrenPublished[contentType.value] != 0}">
<tr>
<td class="indent"/>
<td class="indent"><img
src="../utils/ajaxtree/images/I.png" /></td>
@@ -135,6 +141,7 @@
<td><a
href="ContentWorkflowAction.do?workflowNodetype=${contentType.value}&status=published">${statusInfo.contentChildrenPublished[contentType.value]}</a></td>
</tr>
+ </c:if>
</c:forEach>
</tbody>
</table>
@@ -142,6 +149,8 @@
<div id="tree-asset">
<table class="centerData">
<tbody>
+<%-- <c:if test="${ statusInfo.assetDraft != 0 ||
statusInfo.assetFinished != 0 || statusInfo.assetApproved != 0 ||
statusInfo.assetPublished != 0}">
+--%>
<tr>
<td class="indent" />
<td class="indent"><img
id="tree-asset-plus"
@@ -157,6 +166,8 @@
</c:if>
<td><a
href="AssetWorkflowAction.do?status=published">${statusInfo.assetPublished}</a></td>
</tr>
+<%-- </c:if>
+--%>
</tbody>
</table>
</div>
@@ -164,6 +175,8 @@
<table class="centerData">
<tbody>
<c:forEach var="assetType" items="${statusInfo.assetChildTypes}"
varStatus="itemStatus">
+ <c:if test="${ statusInfo.assetChildrenDraft[assetType.value]
!= 0 || statusInfo.assetChildrenFinished[assetType.value] != 0
+ ||
statusInfo.assetChildrenApproved[assetType.value]!=0 ||
statusInfo.assetChildrenPublished[assetType.value] != 0}">
<tr>
<td class="indent"/>
<td class="indent" />
@@ -185,6 +198,7 @@
<td><a
href="AssetWorkflowAction.do?workflowNodetype=${assetType.value}&status=published">${statusInfo.assetChildrenPublished[assetType.value]}</a></td>
</tr>
+ </c:if>
</c:forEach>
</tbody>
</table>
@@ -193,6 +207,8 @@
<div id="tree-page">
<table class="centerData">
<tbody>
+<%-- <c:if test="${statusInfo.pageDraft != 0 ||
statusInfo.pageFinished != 0 || statusInfo.pageApproved != 0 ||
statusInfo.pagePublished != 0}">
+--%>
<tr>
<td class="leftData"><fmt:message
key="workflow.status.page" /></td>
<td class="indent" />
@@ -205,12 +221,16 @@
</c:if>
<td><a
href="PageWorkflowAction.do?status=published">${statusInfo.pagePublished}</a></td>
</tr>
+<%-- </c:if>
+--%>
</tbody>
</table>
</div>
<div id="tree-link">
<table class="centerData">
<tbody>
+<%-- <c:if test="${ statusInfo.linkFinished != 0 ||
statusInfo.linkApproved != 0 || statusInfo.linkPublished != 0}">
+--%>
<tr>
<td class="leftData"><fmt:message
key="workflow.status.link" /></td>
<td class="indent" />
@@ -223,6 +243,8 @@
</c:if>
<td><a
href="LinkWorkflowAction.do?status=published">${statusInfo.linkPublished}</a></td>
</tr>
+<%-- </c:if>
+--%>
</tbody>
</table>
</div>
Index: workflow_list_table_fragment.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow_list_table_fragment.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- workflow_list_table_fragment.jsp 16 Jan 2009 10:07:26 -0000 1.19
+++ workflow_list_table_fragment.jsp 2 Feb 2009 06:22:12 -0000 1.20
@@ -54,12 +54,6 @@
<tbody class="hover">
<mm:list referid="results" max="${resultsPerPage}"
offset="${offset*resultsPerPage}">
-<tr <mm:even inverse="true">class="swap"</mm:even>>
- <td>
- <mm:field name="workflowitem.number" id="workflowNumber" write="false"/>
- <input type="checkbox" name="check_${workflowNumber}" value="on"/>
- </td>
-
<c:if test="${workflowType == 'allcontent' }">
<mm:field name="workflowitem.type" id="itemType" write="false"/>
<c:if test="${itemType == 'content' }"><c:set var="type"
value="contentelement"/></c:if>
@@ -87,6 +81,17 @@
<c:set var="field" value="title"/>
<c:set var="returnAction" value="PageWorkflowAction.do"/>
</c:if>
+ <mm:field name="${type}.number" jspvar="number" write="false"/>
+ <mm:node number="${number}">
+ <c:set var="nodeType"><mm:node number="${number}"><mm:nodeinfo
type="guitype"/></mm:node></c:set>
+ </mm:node>
+
+<c:if test="${(not empty workflowNodetypeGUI && nodeType eq
workflowNodetypeGUI)||(empty workflowNodetypeGUI)}">
+<tr <mm:even inverse="true">class="swap"</mm:even>>
+ <td>
+ <mm:field name="workflowitem.number" id="workflowNumber" write="false"/>
+ <input type="checkbox" name="check_${workflowNumber}" value="on"/>
+ </td>
<td align="left">
<mm:node number="${workflowNumber}">
<mm:field name="stacktrace" id="stacktrace" write="false"/>
@@ -128,7 +133,6 @@
alt="<fmt:message
key="workflow.icon.versioning.title"/>"/></a>
</mm:haspage>
</c:if>
-
</td>
<td style="white-space: nowrap;">
<mm:node number="${number}"> <mm:nodeinfo type="guitype"/> </mm:node>
@@ -170,6 +174,7 @@
<mm:field name="workflowitem.remark" escape="none"/>
</td>
</tr>
+</c:if>
</mm:list>
</tbody>
</table>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
