Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv5878/webapp/editors/repository
Modified Files:
content.js content.jsp search.jsp unlinkcreation.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.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- content.js 24 Jun 2008 08:53:31 -0000 1.10
+++ content.js 27 Jun 2008 01:51:56 -0000 1.11
@@ -78,7 +78,10 @@
}
function selectChannel(channel, path) {
- document.location = "../MoveContentToChannel.do?parentchannel=" +
moveParentChannel + "&newparentchannel=" + channel + "&objectnumber=" +
moveContentNumber;
+ var newDirection=document.forms[0].direction.value;
+ var type=document.forms[0].order.value;
+ var offset = document.forms[0].offset.value;
+ document.location =
"../Content.do?action=moveContentToChannel&parentchannel=" + moveParentChannel
+ "&newparentchannel=" + channel + "&objectnumber=" +
moveContentNumber+"&orderby="+type+"&direction="+newDirection+'&offset='+offset;;
}
function refreshChannels() {
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- content.jsp 25 Jun 2008 06:52:16 -0000 1.30
+++ content.jsp 27 Jun 2008 01:51:56 -0000 1.31
@@ -122,16 +122,22 @@
<form action="contentMassDelete.do" name="contentForm">
<input type="hidden" name="offset" value="${param.offset}"/>
+<input type="hidden" name="orderby" value="${orderby}" />
+<input type="hidden" name="direction" value="${direction}"/>
<input type="hidden" name="channelnumber" value="<mm:write
referid="parentchannel" />"/>
<% if (role != null && SecurityUtil.isWriter(role)) { %>
+<c:if test="${fn:length(elements) >1}">
<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' />')"/>
+</c:if>
<% } %>
<table>
<thead>
<tr>
<th><% if (role != null && SecurityUtil.isWriter(role)) { %>
+ <c:if test="${fn:length(elements) >1}">
<input type="checkbox" name="selectall"
onclick="selectAll(this.checked, 'contentForm', 'chk_');" value="on"/>
+ </c:if>
<% } %>
</th>
<th><a href="javascript:sortBy('otype','<mm:write
referid="parentchannel" />')" class="headerlink">
@@ -157,7 +163,9 @@
<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)) { %>
+ <c:if test="${fn:length(elements) >1}">
<input type="checkbox" name="chk_<mm:field name="number" />"
value="<mm:field name="number" />"
onClick="document.forms['contentForm'].elements.selectall.checked=false;"/>
+ </c:if>
<% } %>
<a href="javascript:info('<mm:field name="number" />')"><img
src="../gfx/icons/info.png" width="16" height="16"
title="<fmt:message key="content.info" />"
@@ -280,8 +288,10 @@
</tbody>
</table>
<% if (role != null && SecurityUtil.isWriter(role)) { %>
+<c:if test="${fn:length(elements) >1}">
<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' />')"/>
+</c:if>
<% } %>
</form>
<%@ include file="../pages.jsp" %>
Index: search.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/search.jsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- search.jsp 25 Jun 2008 06:52:16 -0000 1.24
+++ search.jsp 27 Jun 2008 01:51:56 -0000 1.25
@@ -325,7 +325,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" />"/>
+ <c:if test="${fn:length(results) >1}">
+ <div align="left"> <input type="button" class="button"
name="massdelete" onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>' )" value="<fmt:message
key="content.delete.massdelete" />"/></div>
+ </c:if>
</mm:hasrank>
</mm:compare>
<mm:compare referid="action" value="link" >
@@ -339,9 +341,13 @@
<input type="hidden" name="channelnumber"
value="<mm:write referid="linktochannel"/>" />
<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>
+ <input type="checkbox"
onclick="selectAll(this.checked, 'linkForm', 'chk_');" value="on"
name="selectall" />
</mm:compare>
-
+ <mm:compare referid="action" value="link" inverse="true">
+ <c:if test="${fn:length(results) >1}">
<input type="checkbox" onclick="selectAll(this.checked,
'linkForm', 'chk_');" value="on" name="selectall" />
+ </c:if>
+ </mm:compare>
</th>
<th><a href="javascript:orderBy('otype')" class="headerlink"
><fmt:message key="locate.typecolumn" /></a></th>
<th><a href="javascript:orderBy('title')" class="headerlink"
><fmt:message key="locate.titlecolumn" /></a></th>
@@ -384,13 +390,13 @@
<td style="white-space: nowrap;">
<cmsc:rights nodeNumber="${creationRelNumber}" var="rights"/>
<mm:compare referid="action" value="link">
- <input type="checkbox" value="<mm:field name="number" />"
name="link_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
+ <input type="checkbox" value="<mm:field name="number" />"
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'}">
+ <c:if test="${creationRelNumber == trashnumber && rights ==
'webmaster' && fn:length(results) >1}">
<input type="checkbox" value="permanentDelete:<mm:field
name="number" />" 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')}">
+ <c:if test="${creationRelNumber != trashnumber && (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster') && fn:length(results) >1}">
<input type="checkbox" value="moveToRecyclebin:<mm:field
name="number" />" name="chk_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
</c:if>
</mm:compare>
@@ -510,7 +516,9 @@
</tbody>
</table>
<mm:compare referid="action" value="link" inverse="true">
+ <c:if test="${fn:length(results) >1}">
<input type="submit" class="button" name="massdelete"
onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.removeconfirm"/>' )" value="<fmt:message
key="content.delete.massdelete" />"/>
+ </c:if>
</mm:compare>
<mm:compare referid="linktochannel" value="" inverse="true">
<input type="submit" class="button" value="<fmt:message
key="searchform.link.submit" />"/>
Index: unlinkcreation.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/unlinkcreation.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- unlinkcreation.jsp 23 Jun 2008 10:18:22 -0000 1.4
+++ unlinkcreation.jsp 27 Jun 2008 01:51:56 -0000 1.5
@@ -29,6 +29,8 @@
</c:if>
<mm:import externid="returnurl" />
<mm:import externid="offset" />
+<mm:import externid="orderby" />
+<mm:import externid="direction" />
<mm:node referid="creationchannel">
<mm:import id="creationnumber"><mm:field name="number"/></mm:import>
</mm:node>
@@ -62,6 +64,12 @@
<mm:present referid="offset">
<mm:param name="offset" value="$offset"/>
</mm:present>
+ <mm:present referid="orderby">
+ <mm:param name="orderby" value="$orderby"/>
+ </mm:present>
+ <mm:present referid="direction">
+ <mm:param name="direction" value="$direction"/>
+ </mm:present>
</mm:url>
<li>
<a href="<mm:write referid="url"/>">
@@ -81,6 +89,12 @@
<mm:present referid="offset">
<mm:param name="offset" value="$offset"/>
</mm:present>
+ <mm:present referid="orderby">
+ <mm:param name="orderby" value="$orderby"/>
+ </mm:present>
+ <mm:present referid="direction">
+ <mm:param name="direction" value="$direction"/>
+ </mm:present>
</mm:url>
<li class="trashbin">
<a href="<mm:write referid="trashurl"/>"><fmt:message
key="unlinkcreation.remove" /></a>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
