Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
In directory
james.mmbase.org:/tmp/cvs-serv22603/java/com/finalist/cmsc/recyclebin/forms
Modified Files:
RestoreAction.java
Log Message:
CMSC-141,Create a restore option in the recycle bin for elements without a
deletionrel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
See also: http://www.mmbase.org/jira/browse/CMSC-141
Index: RestoreAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- RestoreAction.java 10 May 2008 16:31:23 -0000 1.6
+++ RestoreAction.java 26 Sep 2008 06:58:32 -0000 1.7
@@ -54,6 +54,21 @@
}
}
}
+ else {
+ String channelnumber = getParameter(request, "channelnumber");
+ if (StringUtils.isNotEmpty(channelnumber)) {
+ Node channelNode = cloud.getNode(channelnumber);
+ RepositoryUtil.addContentToChannel(objectNode, channelNode);
+ Workflow.create(objectNode, null);
+ }
+ else {
+ contentchannels = RepositoryUtil.getAllContentChannels(cloud);
+ addToRequest(request, "content", objectNode);
+ addToRequest(request, "contentchannels", contentchannels);
+ return mapping.findForward("restore");
+ }
+
+ }
return mapping.findForward(SUCCESS);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
