Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory
james.mmbase.org:/tmp/cvs-serv16625/cmsc/contentrepository/src/webapp/editors/repository
Modified Files:
assetsearch.jsp contentsearch.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/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1260
Index: assetsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- assetsearch.jsp 9 Mar 2009 06:28:50 -0000 1.29
+++ assetsearch.jsp 11 Mar 2009 08:36:40 -0000 1.30
@@ -391,7 +391,6 @@
<c:set var="channelUrl"
value="Asset.do?type=asset&parentchannel=${channelNumber}&direction=down"/>
</mm:compare>
</mm:relatednodes>
- <c:if test="${creationRelNumber ne trashnumber}">
<tr <mm:even inverse="true">class="swap"</mm:even>>
<td style="white-space: nowrap;">
<c:if test="${(rights == 'writer' || rights == 'chiefeditor'
|| rights == 'editor' || rights == 'webmaster') && fn:length(results) >1}">
@@ -439,7 +438,6 @@
</td>
</c:if>
</tr>
- </c:if>
</mm:node>
</mm:field>
<mm:last>
@@ -474,7 +472,6 @@
<mm:field name="number" jspvar="channelNumber" write="false"/>
<cmsc:rights nodeNumber="${channelNumber}" var="rights"/>
</mm:relatednodes>
- <c:if test="${creationRelNumber ne trashnumber}">
<div class="thumbnail_show"
onMouseOut="javascript:hideEditItems(<mm:field name='number'/>)"
onMouseOver="showEditItems(<mm:field name='number'/>)">
<div class="thumbnail_operation">
<div class="asset-info" id="asset-info-<mm:field
name='number'/>" style="display: none; position: relative; border: 1px solid
#eaedff" >
@@ -515,7 +512,6 @@
</div>
</div>
</div>
- </c:if>
</mm:node>
</mm:field>
</mm:list>
Index: contentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- contentsearch.jsp 9 Mar 2009 06:07:19 -0000 1.21
+++ contentsearch.jsp 11 Mar 2009 08:36:40 -0000 1.22
@@ -398,7 +398,6 @@
</mm:relatednodes>
- <c:if test="${creationRelNumber ne trashnumber}">
<tr <mm:even inverse="true">class="swap"</mm:even>>
<td style="white-space: nowrap;">
<cmsc:rights nodeNumber="${creationRelNumber}" var="rights"/>
@@ -511,7 +510,6 @@
</td>
</c:if>
</tr>
- </c:if>
</mm:node>
</mm:field>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
