Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv1363/webapp/editors/repository
Modified Files:
selector.jsp
Log Message:
CMSC-1088 Restore/Delete the Assets from trash
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1088
Index: selector.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/selector.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- selector.jsp 24 Sep 2008 06:06:33 -0000 1.19
+++ selector.jsp 13 Nov 2008 04:24:08 -0000 1.20
@@ -91,9 +91,11 @@
<cmsc:rights nodeNumber="<%=trashNumber.intValue()%>"
var="rolename"/>
<c:if test="${rolename eq 'webmaster'}">
<li class="trashbin">
- <a href="<mm:url page="../recyclebin/index.jsp"/>"
target="content">
+ <mm:countrelations
id="contentNum"type="contentelement" searchdir="destination"
role="contentrel"><mm:write write="false" /></mm:countrelations>
+ <mm:countrelations id="assetNum" type="assetelement"
searchdir="source" role="creationrel"><mm:write write="false"
/></mm:countrelations>
+ <a href="<mm:url page="../recyclebin/index.jsp"/>"
target="content" >
<fmt:message key="selector.recyclebin" />
- (<mm:countrelations type="contentelement"
searchdir="destination" role="contentrel"/>)
+ (<c:out value="${contentNum+assetNum}" />)
</a>
</li>
</c:if>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
