Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources In directory james.mmbase.org:/tmp/cvs-serv17310/resources
Modified Files: Tag: b1_6 attachmentsearch.jsp imagesearch.jsp urlsearch.jsp Log Message: CMSC-1260 Content search also finds elements in Recycle bin See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources See also: http://www.mmbase.org/jira/browse/CMSC-1260 Index: attachmentsearch.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v retrieving revision 1.36.2.2 retrieving revision 1.36.2.3 diff -u -b -r1.36.2.2 -r1.36.2.3 --- attachmentsearch.jsp 2 Mar 2009 11:13:31 -0000 1.36.2.2 +++ attachmentsearch.jsp 11 Mar 2009 09:01:18 -0000 1.36.2.3 @@ -1,7 +1,6 @@ <%...@page language="java" contentType="text/html;charset=utf-8" %><%...@include file="globals.jsp" %><%...@page import="java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil" -%><%...@page import="com.finalist.cmsc.repository.RepositoryUtil" %><mm:content type="text/html" encoding="UTF-8" expires="0"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html:html xhtml="true"> @@ -161,9 +160,6 @@ <c:if test="${assetShow eq 'thumbnail'}"> <div id="assetList" class="hover" style="width:100%" href=""> - <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>"> - <mm:field id="trashnumber" name="number" write="false"/> - </mm:node> <mm:listnodes referid="results"> <mm:field name="description" escape="js-single-quotes" jspvar="description"> <% @@ -175,11 +171,7 @@ <c:if test="${ empty strict}"> <mm:import id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field name="title" escape="js-single-quotes"/>','<mm:image />','120','100', '<%=description%>');</mm:import> </c:if> - <mm:relatednodes role="creationrel" type="contentchannel"> - <c:set var="creationRelNumber"><mm:field name="number" id="creationnumber"/></c:set> - </mm:relatednodes> </mm:field> - <c:if test="${creationRelNumber ne trashnumber}"> <div class="grid" href="<mm:write referid="url"/>" onMouseOut="javascript:hideIcons(<mm:field name='number'/>)" onMouseOver="showIcons(<mm:field name='number'/>)"> <div id="thumbnail-icons-<mm:field name='number'/>" class="thumbnail-icons"> <a href="javascript:showInfo(<mm:field name="number" />)"> @@ -206,7 +198,6 @@ <br/> </div> </div> - </c:if> </mm:listnodes> </div> </c:if> @@ -228,9 +219,6 @@ </tr> </c:if> <tbody id="assetList" class="hover" href=""> - <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>"> - <mm:field id="trashnumber" name="number" write="false"/> - </mm:node> <c:set var="useSwapStyle">true</c:set> <mm:listnodes referid="results"> <mm:field name="description" escape="js-single-quotes" @@ -244,11 +232,7 @@ <c:if test="${ empty strict}"> <mm:import id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field name="title" escape="js-single-quotes"/>','<mm:image />','120','100', '<%=description%>');</mm:import> </c:if> - <mm:relatednodes role="creationrel" type="contentchannel"> - <c:set var="creationRelNumber"><mm:field name="number" id="creationnumber"/></c:set> - </mm:relatednodes> </mm:field> - <c:if test="${creationRelNumber ne trashnumber}"> <tr <c:if test="${useSwapStyle}">class="swap"</c:if> href="<mm:write referid="url"/>"> <td style="white-space: nowrap;"> @@ -280,7 +264,6 @@ </c:if> </td> </tr> - </c:if> <c:set var="useSwapStyle">${!useSwapStyle}</c:set> </mm:listnodes> </tbody> Index: imagesearch.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v retrieving revision 1.51.2.2 retrieving revision 1.51.2.3 diff -u -b -r1.51.2.2 -r1.51.2.3 --- imagesearch.jsp 2 Mar 2009 11:13:31 -0000 1.51.2.2 +++ imagesearch.jsp 11 Mar 2009 09:01:18 -0000 1.51.2.3 @@ -1,7 +1,6 @@ <%...@page language="java" contentType="text/html;charset=utf-8" %><%...@include file="globals.jsp" %><%...@page import="java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil" -%><%...@page import="com.finalist.cmsc.repository.RepositoryUtil" %><mm:content type="text/html" encoding="UTF-8" expires="0"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html:html xhtml="true"> @@ -162,9 +161,6 @@ <c:if test="${assetShow eq 'thumbnail'}"> <div id="assetList" class="hover" style="width:100%" href=""> - <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>"> - <mm:field id="trashnumber" name="number" write="false"/> - </mm:node> <mm:listnodes referid="results"> <mm:field name="description" escape="js-single-quotes" jspvar="description"> <% @@ -176,11 +172,7 @@ <c:if test="${ empty strict}"> <mm:import id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field name="title" escape="js-single-quotes"/>','<mm:image />','<mm:field name="width"/>','<mm:field name="height"/>', '<%=description%>');</mm:import> </c:if> - <mm:relatednodes role="creationrel" type="contentchannel"> - <c:set var="creationRelNumber"><mm:field name="number" id="creationnumber"/></c:set> - </mm:relatednodes> </mm:field> - <c:if test="${creationRelNumber ne trashnumber}"> <div class="grid" href="<mm:write referid="url"/>" onMouseOut="javascript:hideIcons(<mm:field name='number'/>)" onMouseOver="showIcons(<mm:field name='number'/>)"> <div id="thumbnail-icons-<mm:field name='number'/>" class="thumbnail-icons"> <a href="javascript:showInfo(<mm:field name="number" />)"> @@ -195,7 +187,6 @@ <br/><mm:field name="itype" /> </div> </div> - </c:if> </mm:listnodes> </div> </c:if> @@ -217,9 +208,6 @@ </tr> </c:if> <tbody id="assetList" class="hover" href=""> - <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>"> - <mm:field id="trashnumber" name="number" write="false"/> - </mm:node> <c:set var="useSwapStyle">true</c:set> <mm:listnodes referid="results"> <mm:field name="description" escape="js-single-quotes" jspvar="description"> @@ -232,11 +220,7 @@ <c:if test="${ empty strict}"> <mm:import id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field name="title" escape="js-single-quotes"/>','<mm:image />','<mm:field name="width"/>','<mm:field name="height"/>', '<%=description%>');</mm:import> </c:if> - <mm:relatednodes role="creationrel" type="contentchannel"> - <c:set var="creationRelNumber"><mm:field name="number" id="creationnumber"/></c:set> - </mm:relatednodes> </mm:field> - <c:if test="${creationRelNumber ne trashnumber}"> <tr <c:if test="${useSwapStyle}">class="swap"</c:if> href="<mm:write referid="url"/>"> <td style="white-space: nowrap;"> @@ -257,7 +241,6 @@ <td onMouseDown="initParentHref(this.parentNode)"><img src="<mm:image template="s(120x100)"/>" alt="" /></td> </tr> - </c:if> <c:set var="useSwapStyle">${!useSwapStyle}</c:set> </mm:listnodes> </tbody> Index: urlsearch.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp,v retrieving revision 1.24.2.2 retrieving revision 1.24.2.3 diff -u -b -r1.24.2.2 -r1.24.2.3 --- urlsearch.jsp 2 Mar 2009 11:13:31 -0000 1.24.2.2 +++ urlsearch.jsp 11 Mar 2009 09:01:18 -0000 1.24.2.3 @@ -1,7 +1,6 @@ <%...@page language="java" contentType="text/html;charset=utf-8" %><%...@include file="globals.jsp" %><%...@page import="java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil" -%><%...@page import="com.finalist.cmsc.repository.RepositoryUtil" %><mm:content type="text/html" encoding="UTF-8" expires="0"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html:html xhtml="true"> @@ -162,9 +161,6 @@ <c:if test="${assetShow eq 'thumbnail'}"> <div id="assetList" class="hover" style="width:100%" href=""> - <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>"> - <mm:field id="trashnumber" name="number" write="false"/> - </mm:node> <mm:listnodes referid="results"> <c:if test="${strict == 'urls'}"> <mm:import id="url">javascript:top.opener.selectContent('<mm:field name="number" />', '', ''); top.close();</mm:import> @@ -172,10 +168,6 @@ <c:if test="${ empty strict}"> <mm:import id="url">javascript:selectElement('<mm:field name="number" />', '<mm:field name="title" escape="js-single-quotes"/>','<mm:field name="url" />');</mm:import> </c:if> - <mm:relatednodes role="creationrel" type="contentchannel"> - <c:set var="creationRelNumber"><mm:field name="number" id="creationnumber"/></c:set> - </mm:relatednodes> - <c:if test="${creationRelNumber ne trashnumber}"> <div class="grid" href="<mm:write referid="url"/>" onMouseOut="javascript:hideIcons(<mm:field name='number'/>)" onMouseOver="showIcons(<mm:field name='number'/>)"> <div id="thumbnail-icons-<mm:field name='number'/>" class="thumbnail-icons"> <a href="javascript:showInfo(<mm:field name="number" />)"> @@ -206,7 +198,6 @@ </c:choose> </div> </div> - </c:if> </mm:listnodes> </div> </c:if> @@ -226,9 +217,6 @@ </tr> </c:if> <tbody id="assetList" class="hover" href=""> - <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>"> - <mm:field id="trashnumber" name="number" write="false"/> - </mm:node> <c:set var="useSwapStyle">true</c:set> <mm:listnodes referid="results"> <c:if test="${strict == 'urls'}"> @@ -237,10 +225,6 @@ <c:if test="${ empty strict}"> <mm:import id="url">javascript:selectElement('<mm:field name="number" />', '<mm:field name="title" escape="js-single-quotes"/>','<mm:field name="url" />');</mm:import> </c:if> - <mm:relatednodes role="creationrel" type="contentchannel"> - <c:set var="creationRelNumber"><mm:field name="number" id="creationnumber"/></c:set> - </mm:relatednodes> - <c:if test="${creationRelNumber ne trashnumber}"> <tr <c:if test="${useSwapStyle}">class="swap"</c:if> href="<mm:write referid="url"/>"> <td style="white-space:nowrap;"> <a href="javascript:showInfo(<mm:field name="number" />)"> @@ -268,7 +252,6 @@ </c:choose> </td> </tr> - </c:if> <c:set var="useSwapStyle">${!useSwapStyle}</c:set> </mm:listnodes> </tbody> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs