Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory
james.mmbase.org:/tmp/cvs-serv16927/cmsc/contentrepository/src/webapp/editors/repository
Modified Files:
Tag: b1_6
searchIconsBar.jspf contentsearch.jsp assetsearch.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: searchIconsBar.jspf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/searchIconsBar.jspf,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- searchIconsBar.jspf 9 Jan 2009 10:28:09 -0000 1.6
+++ searchIconsBar.jspf 2 Mar 2009 10:10:03 -0000 1.6.2.1
@@ -36,12 +36,7 @@
</cmsc:hasfeature>
</mm:compare>
<c:if test="${empty insertAsset}">
- <c:if test="${creationRelNumber == trashnumber && rights ==
'webmaster'}">
- <a href="javascript:deleteAsset('<mm:field
name='number'/>','<fmt:message key="recyclebin.removeconfirm"/>')">
- <img src="../gfx/icons/delete.png" title="<fmt:message
key="searchform.icon.delete.recyclebin" />" alt="<fmt:message
key="searchform.icon.delete.recyclebin" />"/>
- </a>
- </c:if>
- <c:if test="${creationRelNumber != trashnumber && (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster')}">
+ <c:if test="${rights == 'writer' || rights == 'chiefeditor' ||
rights == 'editor' || rights == 'webmaster'}">
<a href="javascript:deleteAsset('<mm:field
name='number'/>')"><img src="../gfx/icons/delete.png" title="<fmt:message
key="searchform.icon.delete.channel" />" alt="<fmt:message
key="searchform.icon.delete.channel" />"/></a>
</c:if>
</c:if>
\ No newline at end of file
Index: contentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- contentsearch.jsp 9 Feb 2009 14:48:32 -0000 1.18
+++ contentsearch.jsp 2 Mar 2009 10:10:03 -0000 1.18.2.1
@@ -398,7 +398,7 @@
</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"/>
@@ -406,10 +406,7 @@
<input type="checkbox" value="<mm:field name="number" />"
class="checkbox" name="chk_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
</mm:compare>
<mm:compare referid="action" value="link" inverse="true">
- <c:if test="${creationRelNumber == trashnumber && rights ==
'webmaster' && fn:length(results) >1}">
- <input type="checkbox" value="permanentDelete:<mm:field
name="number" />" class="checkbox" name="chk_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
- </c:if>
- <c:if test="${creationRelNumber != trashnumber && (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster') && fn:length(results) >1}">
+ <c:if test="${(rights == 'writer' || rights == 'chiefeditor'
|| rights == 'editor' || rights == 'webmaster') && fn:length(results) >1}">
<input type="checkbox" value="moveToRecyclebin:<mm:field
name="number" />" class="checkbox" name="chk_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
</c:if>
</mm:compare>
@@ -465,12 +462,7 @@
</c:if>
</cmsc:hasfeature>
</mm:compare>
- <c:if test="${creationRelNumber == trashnumber && rights ==
'webmaster'}">
- <a href="javascript:deleteContent('<mm:field
name='number'/>','<fmt:message key="recyclebin.removeconfirm"/>')">
- <img src="../gfx/icons/delete.png" title="<fmt:message
key="searchform.icon.delete.recyclebin" />" alt="<fmt:message
key="searchform.icon.delete.recyclebin" />"/>
- </a>
- </c:if>
- <c:if test="${creationRelNumber != trashnumber && (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster')}">
+ <c:if test="${rights == 'writer' || rights == 'chiefeditor' ||
rights == 'editor' || rights == 'webmaster'}">
<a href="javascript:deleteContent('<mm:field
name='number'/>')"><img src="../gfx/icons/delete.png" title="<fmt:message
key="searchform.icon.delete.channel" />" alt="<fmt:message
key="searchform.icon.delete.channel" />"/></a>
</c:if>
@@ -519,7 +511,7 @@
</td>
</c:if>
</tr>
-
+ </c:if>
</mm:node>
</mm:field>
Index: assetsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -b -r1.26 -r1.26.2.1
--- assetsearch.jsp 13 Feb 2009 08:22:41 -0000 1.26
+++ assetsearch.jsp 2 Mar 2009 10:10:03 -0000 1.26.2.1
@@ -391,12 +391,10 @@
<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="${creationRelNumber == trashnumber && rights ==
'webmaster' && fn:length(results) >1}">
- <input type="checkbox" value="permanentDelete:<mm:field
name="number" />" class="checkbox" name="chk_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
- </c:if>
- <c:if test="${creationRelNumber != trashnumber && (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster') && fn:length(results) >1}">
+ <c:if test="${(rights == 'writer' || rights == 'chiefeditor'
|| rights == 'editor' || rights == 'webmaster') && fn:length(results) >1}">
<input type="checkbox" value="moveToRecyclebin:<mm:field
name="number" />" class="checkbox" name="chk_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
</c:if>
<%@ include file="searchIconsBar.jspf" %>
@@ -441,6 +439,7 @@
</td>
</c:if>
</tr>
+ </c:if>
</mm:node>
</mm:field>
<mm:last>
@@ -475,7 +474,7 @@
<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" >
@@ -516,6 +515,7 @@
</div>
</div>
</div>
+ </c:if>
</mm:node>
</mm:field>
</mm:list>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
