Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv11975
Modified Files:
channeldeletewarning.jsp
Log Message:
CMSC-681 Asset -Deleting the Assets when deleting the channel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: channeldeletewarning.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/channeldeletewarning.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- channeldeletewarning.jsp 1 Oct 2008 11:04:48 -0000 1.7
+++ channeldeletewarning.jsp 18 Nov 2008 08:47:06 -0000 1.8
@@ -24,7 +24,7 @@
<div class="body">
<c:set var="relcount1" value="0"/>
<c:set var="relcount2" value="0"/>
-
+ <c:set var="relcount3" value="0"/>
<mm:list nodes="$parentchannel"
path="contentchannel,creationrel,contentelement">
<mm:field name="contentelement.number" id="cenumber" write="false"/>
@@ -41,7 +41,10 @@
</c:choose>
</mm:first>
</mm:list>
+ </mm:list>
+ <mm:list nodes="$parentchannel"
path="contentchannel,creationrel,assetelement">
+ <c:set var="relcount3" value="${relcount3 + 1}"/>
</mm:list>
<p>
@@ -51,7 +54,7 @@
<ul>
<li>
<fmt:message key="channeldelete.message.1">
- <fmt:param >${relcount1}</fmt:param>
+ <fmt:param >${relcount1+relcount3}</fmt:param>
</fmt:message>
</li>
<c:if test="${relcount2 ne 0}">
@@ -182,6 +185,57 @@
</mm:last>
</mm:listnodes>
</mm:relatednodescontainer>
+ <mm:relatednodescontainer path="creationrel,assetelement"
searchdirs="source" element="assetelement">
+ <mm:sortorder field="assetelement.otype" direction="up" />
+ <mm:sortorder field="assetelement.title" direction="up" />
+
+ <mm:listnodes jspvar="node">
+ <mm:field name="otype" write="false" id="aotype" />
+ <mm:field name="number" write="false" id="anumber" />
+
+ <mm:compare referid="lastotype" value="" inverse="true">
+ </tr>
+ </mm:compare>
+ <mm:compare referid="aotype" referid2="lastotype"
inverse="true">
+ <mm:compare referid="lastotype" value="" inverse="true">
+ </table>
+ </mm:compare>
+
+ <mm:node referid="aotype">
+ <br />
+ <fmt:message key="recyclebin.type">
+ <fmt:param>
+ <mm:field name="name" id="anodename">
+ <mm:nodeinfo nodetype="$anodename"
type="guitype" />
+ </mm:field>
+ </fmt:param>
+ </fmt:message>
+ </mm:node>
+ <mm:import id="lastotype" reset="true"><mm:write
referid="aotype" /></mm:import>
+
+ <table class="listcontent">
+ </mm:compare>
+
+ <tr class="itemrow" >
+ <td><mm:field name="number" /></td>
+ <td nowrap>
+ <a href="javascript:info('<mm:field name="number" />');">
+ <img src="../gfx/icons/info.png" width="16"
height="16" alt="<fmt:message key="channeldelete.info" />" />
+ </a>
+ <a href="javascript:unpublish('<mm:write
referid="parentchannel" />','<mm:field name="number" />');">
+ <img src="../gfx/icons/delete.png" width="16"
height="16" alt="<fmt:message key="channeldelete.unlink" />" />
+ </a>
+ </td>
+ <td width="100%"><mm:field name="title" /></td>
+
+ <mm:last>
+ <mm:compare referid="lastotype" value="" inverse="true">
+ </tr>
+ </table>
+ </mm:compare>
+ </mm:last>
+ </mm:listnodes>
+ </mm:relatednodescontainer>
</mm:node>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
