Author: kbettinger
Date: 2010-06-18 13:53:32 +0200 (Fri, 18 Jun 2010)
New Revision: 42601
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/selector.jsp
Log:
CMSC-1711 - Quick Search view in content explorer doesnt work in tomcat 6
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/selector.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/selector.jsp
2010-06-18 10:53:52 UTC (rev 42600)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/selector.jsp
2010-06-18 11:53:32 UTC (rev 42601)
@@ -110,21 +110,19 @@
<ul class="shortcuts">
<mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
- <mm:field name="number" jspvar="trashNumber" vartype="Integer">
+ <mm:field name="number" id="trashNumber" write="false" />
- <cmsc:rights nodeNumber="<%=trashNumber.intValue()%>"
var="rolename"/>
- <c:if test="${rolename eq 'webmaster'}">
- <li class="trashbin">
- <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/contenttrash.jsp"/>" target="content" >
- <fmt:message key="selector.recyclebin" />
- (<c:out value="${contentNum+assetNum}" />)
- </a>
- </li>
- </c:if>
-
- </mm:field>
+ <cmsc:rights nodeNumber="${trashNumber}" var="rolename"/>
+ <c:if test="${rolename eq 'webmaster'}">
+ <li class="trashbin">
+ <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/contenttrash.jsp"/>"
target="content" >
+ <fmt:message key="selector.recyclebin" />
+ (<c:out value="${contentNum+assetNum}" />)
+ </a>
+ </li>
+ </c:if>
</mm:node>
</ul>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
