Update of
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/forms
In directory
james.mmbase.org:/tmp/cvs-serv5262/alias/src/java/com/finalist/cmsc/alias/forms
Modified Files:
Tag: b1_4
AliasCreate.java AliasEdit.java AliasDelete.java
Log Message:
CMSC-800 created stacking of more then 5 alias elements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/forms
See also: http://www.mmbase.org/jira/browse/CMSC-800
Index: AliasCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/forms/AliasCreate.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- AliasCreate.java 24 Dec 2007 13:43:52 -0000 1.1
+++ AliasCreate.java 17 Mar 2008 12:28:40 -0000 1.1.2.1
@@ -26,12 +26,14 @@
String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
+ boolean stacked=(request.getParameter("stacked") != null &&
request.getParameter("stacked").equals("true"));
if (StringUtil.isEmptyOrWhitespace(action)) {
request.getSession().setAttribute("parentpage", parentpage);
+
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
- + "&contenttype=pagealias" + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ + "&contenttype=pagealias" + "&returnurl=" +
mapping.findForward("returnurl").getPath() + "?stacked="+stacked);
ret.setRedirect(true);
return ret;
}
@@ -41,8 +43,12 @@
NavigationUtil.appendChild(cloud, parentpage, ewnodelastedited);
addToRequest(request, "showalias", ewnodelastedited);
- ActionForward ret = mapping.findForward(SUCCESS);
- return ret;
+ if(!stacked) {
+ return mapping.findForward(SUCCESS);
+ }
+ else {
+ return new
ActionForward(mapping.findForward("stacked").getPath()+"?parent="+parentpage);
+ }
}
request.getSession().removeAttribute("parentpage");
ActionForward ret = mapping.findForward(CANCEL);
Index: AliasEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/forms/AliasEdit.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- AliasEdit.java 24 Dec 2007 13:43:52 -0000 1.1
+++ AliasEdit.java 17 Mar 2008 12:28:40 -0000 1.1.2.1
@@ -23,21 +23,30 @@
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
+ boolean stacked=(request.getParameter("stacked") != null &&
request.getParameter("stacked").equals("true"));
if (StringUtil.isEmptyOrWhitespace(action)) {
+ request.getSession().setAttribute("parentpage", parentpage);
+
String objectnumber = getParameter(request, "number", true);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber="
- + objectnumber + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ + objectnumber + "&returnurl=" +
mapping.findForward("returnurl").getPath() + "?stacked="+stacked);
ret.setRedirect(true);
return ret;
}
else {
String ewnodelastedited = getParameter(request, "ewnodelastedited");
+
addToRequest(request, "showalias", ewnodelastedited);
- ActionForward ret = mapping.findForward(SUCCESS);
- return ret;
+ if(!stacked) {
+ return mapping.findForward(SUCCESS);
+ }
+ else {
+ return new
ActionForward(mapping.findForward("stacked").getPath()+"?parent="+parentpage);
+ }
}
}
Index: AliasDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/forms/AliasDelete.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- AliasDelete.java 4 Jan 2008 13:55:40 -0000 1.2
+++ AliasDelete.java 17 Mar 2008 12:28:40 -0000 1.2.2.1
@@ -31,8 +31,12 @@
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ String parentpage = getParameter(request, "parentpage", true);
+ boolean stacked=(request.getParameter("stacked") != null &&
request.getParameter("stacked").equals("true"));
if (isRemoveAction(request)) {
+ request.getSession().setAttribute("parentpage", parentpage);
+
String objectnumber = getParameter(request, "number", true);
Node aliasNode = cloud.getNode(objectnumber);
Node pageNode = aliasNode.getRelatedNodes("page").getNode(0);
@@ -43,15 +47,25 @@
if (isEditor) {
NavigationUtil.deleteItem(aliasNode);
}
+ if(!stacked) {
return mapping.findForward(SUCCESS);
}
+ else {
+ return new
ActionForward(mapping.findForward("stacked").getPath()+"?parent="+parentpage);
+ }
+ }
if (isCancelAction(request)) {
+ if(!stacked) {
return mapping.findForward(SUCCESS);
}
+ else {
+ return new
ActionForward(mapping.findForward("stacked").getPath()+"?parent="+parentpage);
+ }
+ }
// neither remove or cancel, show confirmation page
- return mapping.findForward("delete");
+ return new
ActionForward(mapping.findForward("delete").getPath()+"?stacked="+stacked);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
