Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv5878/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java ContentMassDeleteAction.java
LinkToChannelAction.java MoveContentToChannelAction.java
Log Message:
CMSC-412, mass move, delete of content elements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-412
Index: ContentAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ContentAction.java 5 Jun 2008 02:32:19 -0000 1.10
+++ ContentAction.java 27 Jun 2008 01:51:56 -0000 1.11
@@ -27,10 +27,15 @@
public class ContentAction extends MMBaseAction {
+ private final static String MOVECONTENTTOCHANNEL = "moveContentToChannel";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
+ String action = request.getParameter("action");
+ if(StringUtils.isNotEmpty(action) &&
action.equals(MOVECONTENTTOCHANNEL)) {
+ return mapping.findForward(MOVECONTENTTOCHANNEL);
+ }
List<LabelValueBean> typesList = new ArrayList<LabelValueBean>();
List<NodeManager> types = ContentElementUtil.getContentTypes(cloud);
Index: ContentMassDeleteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentMassDeleteAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ContentMassDeleteAction.java 23 Jun 2008 10:18:21 -0000 1.1
+++ ContentMassDeleteAction.java 27 Jun 2008 01:51:56 -0000 1.2
@@ -28,10 +28,16 @@
String action = getParameter(request, "action");
String channelnumber = getParameter(request, "channelnumber");
String offset = getParameter(request, "offset");
+ String orderBy = getParameter(request, "orderby");
+ String direction = getParameter(request, "direction");
Node channelNode = cloud.getNode(channelnumber);
List<Integer> numbers = new ArrayList<Integer>();
- if (action == null) {
+ if(StringUtils.isEmpty(direction)) {
+ direction = "down";
+ }
+
+ if (action == null) {
Enumeration<String> parameters = request.getParameterNames();
while (parameters.hasMoreElements()) {
String parameter = parameters.nextElement();
@@ -105,14 +111,23 @@
addToRequest(request, "trashchannel",
RepositoryUtil.getTrashNode(cloud));
addToRequest(request, "action", "massmove");
addToRequest(request, "offset", offset);
+ addToRequest(request, "orderby", orderBy);
+ addToRequest(request, "direction", direction);
return mapping.findForward("unlinkcreation");
}
}
+
String url = mapping.findForward(SUCCESS).getPath() +
"?parentchannel=" + channelnumber;
if(StringUtils.isNotEmpty(offset)) {
url += "&offset="+offset;
}
+ if(StringUtils.isNotEmpty(orderBy)) {
+ url += "&orderby="+orderBy;
+ }
+ if(StringUtils.isNotEmpty(direction)) {
+ url += "&direction="+direction;
+ }
return new ActionForward(url, true);
}
Index: LinkToChannelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/LinkToChannelAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- LinkToChannelAction.java 10 May 2008 16:31:23 -0000 1.11
+++ LinkToChannelAction.java 27 Jun 2008 01:51:56 -0000 1.12
@@ -32,7 +32,6 @@
String action = getParameter(request, "action");
String channelnumber = getParameter(request, "channelnumber");
Node channelNode = cloud.getNode(channelnumber);
-
String objectnumber = getParameter(request, "objectnumber");
if (action != null && action.equals("unlink")) {
@@ -95,8 +94,7 @@
Enumeration<String> parameters = request.getParameterNames();
while (parameters.hasMoreElements()) {
String parameter = parameters.nextElement();
-
- if (parameter.startsWith("link_")) {
+ if (parameter.startsWith("chk_")) {
String link = request.getParameter(parameter);
Node contentNode = cloud.getNode(link);
linkedNodes.add(contentNode);
Index: MoveContentToChannelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentToChannelAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- MoveContentToChannelAction.java 24 Jun 2008 08:53:31 -0000 1.4
+++ MoveContentToChannelAction.java 27 Jun 2008 01:51:56 -0000 1.5
@@ -19,6 +19,7 @@
import net.sf.mmapps.commons.bridge.RelationUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -37,13 +38,19 @@
private static final String PARAMETER_CHANNEL = "parentchannel";
private static final String PARAMETER_NEW_CHANNEL = "newparentchannel";
private static final String PARAMETER_NUMBER = "objectnumber";
-
+ private static final String PARAMETER_PAGING_ODERBY = "orderby";
+ private static final String PARAMETER_PAGING_OFFSET = "offset";
+ private static final String PARAMETER_PAGING_DIRECTION = "direction";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
+
String objectNumber = request.getParameter(PARAMETER_NUMBER);
+ String orderBy = request.getParameter(PARAMETER_PAGING_ODERBY);
+ String offset = request.getParameter(PARAMETER_PAGING_OFFSET);
+ String direction = request.getParameter(PARAMETER_PAGING_DIRECTION);
int channel = Integer.parseInt(request.getParameter(PARAMETER_CHANNEL));
int newChannel =
Integer.parseInt(request.getParameter(PARAMETER_NEW_CHANNEL));
@@ -102,9 +109,21 @@
else {
message = resources.getMessage(locale,
"content.movetochannel.failed", newChannelNode.getStringValue("name"));
}
- String path = mapping.findForward(SUCCESS).getPath() + "?" +
PARAMETER_CHANNEL + "=" + channel
- + "&direction=down&message=" + URLEncoder.encode(message, "UTF-8");
- return new ActionForward(path);
+ String path = mapping.findForward(SUCCESS).getPath() + "?" +
PARAMETER_CHANNEL + "=" + channel;
+
+ if(StringUtils.isNotEmpty(offset)) {
+ path += "&offset="+offset;
+ }
+ if(StringUtils.isNotEmpty(orderBy)) {
+ path += "&orderby="+orderBy;
+ }
+ if(StringUtils.isNotEmpty(direction)) {
+ path += "&direction="+direction;
+ }
+ path += "&message=" + URLEncoder.encode(message, "UTF-8");
+ ActionForward actionForward = new ActionForward(path);
+ actionForward.setRedirect(true);
+ return actionForward;
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
