Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv8958
Modified Files:
content.jsp search.jsp
Log Message:
CMSC-412, mass move, delete of content elements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-412
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- content.jsp 24 Jun 2008 08:53:31 -0000 1.29
+++ content.jsp 25 Jun 2008 06:52:16 -0000 1.30
@@ -123,13 +123,17 @@
<form action="contentMassDelete.do" name="contentForm">
<input type="hidden" name="offset" value="${param.offset}"/>
<input type="hidden" name="channelnumber" value="<mm:write
referid="parentchannel" />"/>
+<% if (role != null && SecurityUtil.isWriter(role)) { %>
<input type="submit" class="button" value="<fmt:message
key="content.delete.massdelete" />"/>
<input type="button" class="button" value="<fmt:message
key="content.delete.massmove" />" onclick="massMove('${parentchannel}','<c:url
value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/>
-
+<% } %>
<table>
<thead>
<tr>
- <th><input type="checkbox" name="selectall"
onclick="selectAll(this.checked, 'contentForm', 'chk_');" value="on"/></th>
+ <th><% if (role != null && SecurityUtil.isWriter(role)) { %>
+ <input type="checkbox" name="selectall"
onclick="selectAll(this.checked, 'contentForm', 'chk_');" value="on"/>
+ <% } %>
+ </th>
<th><a href="javascript:sortBy('otype','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.typecolumn"/></a></th>
<th><a href="javascript:sortBy('title','<mm:write
referid="parentchannel" />')" class="headerlink">
@@ -152,7 +156,9 @@
</mm:url>
<tr <mm:even inverse="true">class="swap"</mm:even> href="<mm:write
referid="url"/>">
<td style="white-space: nowrap;">
+ <% if (role != null && SecurityUtil.isWriter(role)) { %>
<input type="checkbox" name="chk_<mm:field name="number" />"
value="<mm:field name="number" />"
onClick="document.forms['contentForm'].elements.selectall.checked=false;"/>
+ <% } %>
<a href="javascript:info('<mm:field name="number" />')"><img
src="../gfx/icons/info.png" width="16" height="16"
title="<fmt:message key="content.info" />"
alt="<fmt:message key="content.info" />"/></a>
@@ -273,8 +279,10 @@
</mm:listnodes>
</tbody>
</table>
+<% if (role != null && SecurityUtil.isWriter(role)) { %>
<input type="submit" class="button" value="<fmt:message
key="content.delete.massdelete" />"/>
<input type="button" class="button" value="<fmt:message
key="content.delete.massmove" />" onclick="massMove('${parentchannel}','<c:url
value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/>
+<% } %>
</form>
<%@ include file="../pages.jsp" %>
</div>
Index: search.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/search.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- search.jsp 24 Jun 2008 08:26:35 -0000 1.23
+++ search.jsp 25 Jun 2008 06:52:16 -0000 1.24
@@ -324,7 +324,9 @@
<form action="LinkToChannelAction.do" name="linkForm">
<mm:compare referid="action" value="link" inverse="true">
+ <mm:hasrank minvalue="administrator">
<input type="button" class="button" name="massdelete"
onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>' )" value="<fmt:message
key="content.delete.massdelete" />"/>
+ </mm:hasrank>
</mm:compare>
<mm:compare referid="action" value="link" >
<input type="submit" class="button" value="<fmt:message
key="searchform.link.submit" />"/>
@@ -338,6 +340,7 @@
<input type="hidden" name="channel" value="<mm:write
referid="linktochannel"/>" />
<mm:present referid="returnurl"><input type="hidden"
name="returnurl" value="<mm:write referid="returnurl"/>"/></mm:present>
</mm:compare>
+
<input type="checkbox" onclick="selectAll(this.checked,
'linkForm', 'chk_');" value="on" name="selectall" />
</th>
<th><a href="javascript:orderBy('otype')" class="headerlink"
><fmt:message key="locate.typecolumn" /></a></th>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
