Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
In directory
james.mmbase.org:/tmp/cvs-serv10336/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
Modified Files:
PageCreate.java PageEdit.java SiteCreate.java SiteEdit.java
Log Message:
CMSC-990 pagingUtil modify, change page, site create forward to new edit page
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
See also: http://www.mmbase.org/jira/browse/CMSC-990
Index: PageCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/PageCreate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PageCreate.java 10 May 2008 16:31:23 -0000 1.5
+++ PageCreate.java 28 Jul 2008 14:51:42 -0000 1.6
@@ -31,12 +31,11 @@
if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentpage", parentpage);
- ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
- + "&contenttype=" + PagesUtil.PAGE + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create" +
"&contenttype=" + PagesUtil.PAGE
+ + "&returnurl=" +
mapping.findForward("returnurl").getPath());
ret.setRedirect(true);
return ret;
- }
- else {
+ } else {
if ("save".equals(action)) {
String ewnodelastedited = getParameter(request,
"ewnodelastedited");
NavigationUtil.appendChild(cloud, parentpage, ewnodelastedited);
@@ -46,8 +45,7 @@
PagesUtil.linkPortlets(newPage, layoutNode);
request.getSession().removeAttribute("parentpage");
addToRequest(request, "showpage", ewnodelastedited);
- ActionForward ret = new
ActionForward("/editors/site/NavigatorPanel.do?nodeId=" + ewnodelastedited
- + "&fresh=fresh");
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" +
ewnodelastedited + "&fresh=fresh");
return ret;
}
request.getSession().removeAttribute("parentpage");
Index: PageEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/PageEdit.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PageEdit.java 10 May 2008 16:31:23 -0000 1.5
+++ PageEdit.java 28 Jul 2008 14:51:42 -0000 1.6
@@ -9,10 +9,11 @@
*/
package com.finalist.cmsc.navigation.forms;
+import java.net.URLEncoder;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
-
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
@@ -30,16 +31,14 @@
if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
- ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber="
- + objectnumber + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
+ +
mapping.findForward("returnurl").getPath() + URLEncoder.encode("?objectnumber")
+ "=" + objectnumber);
ret.setRedirect(true);
return ret;
- }
- else {
+ } else {
+ int nodeId =
Integer.parseInt(request.getParameter("objectnumber"));
SecurityUtil.clearUserRoles(cloud);
- String ewnodelastedited = getParameter(request, "ewnodelastedited");
- addToRequest(request, "showpage", ewnodelastedited);
- ActionForward ret = mapping.findForward(SUCCESS);
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
return ret;
}
}
Index: SiteCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/SiteCreate.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SiteCreate.java 28 May 2008 09:02:30 -0000 1.8
+++ SiteCreate.java 28 Jul 2008 14:51:42 -0000 1.9
@@ -31,12 +31,11 @@
String action = getParameter(request, "action");
if (StringUtils.isBlank(action)) {
- ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
- + "&contenttype=" + SiteUtil.SITE + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create" +
"&contenttype=" + SiteUtil.SITE
+ + "&returnurl=" +
mapping.findForward("returnurl").getPath());
ret.setRedirect(true);
return ret;
- }
- else {
+ } else {
if ("save".equals(action)) {
String ewnodelastedited = getParameter(request,
"ewnodelastedited");
Node administrators = SecurityUtil.getAdministratorsGroup(cloud);
@@ -52,9 +51,7 @@
addToRequest(request, "showpage", ewnodelastedited);
-// ActionForward ret = mapping.findForward(SUCCESS);
- ActionForward ret = new
ActionForward("/editors/site/NavigatorPanel.do?nodeId=" + ewnodelastedited
- + "&fresh=fresh");
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" +
ewnodelastedited + "&fresh=fresh");
return ret;
}
ActionForward ret = mapping.findForward(CANCEL);
@@ -62,7 +59,6 @@
}
}
-
@Override
public String getRequiredRankStr() {
return ADMINISTRATOR;
Index: SiteEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/SiteEdit.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SiteEdit.java 10 May 2008 16:31:23 -0000 1.5
+++ SiteEdit.java 28 Jul 2008 14:51:42 -0000 1.6
@@ -9,6 +9,8 @@
*/
package com.finalist.cmsc.navigation.forms;
+import java.net.URLEncoder;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
@@ -30,21 +32,18 @@
if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
- ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber="
- + objectnumber + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
+ +
mapping.findForward("returnurl").getPath() + URLEncoder.encode("?objectnumber")
+ "=" + objectnumber);
ret.setRedirect(true);
return ret;
- }
- else {
+ } else {
+ int nodeId =
Integer.parseInt(request.getParameter("objectnumber"));
SecurityUtil.clearUserRoles(cloud);
- String ewnodelastedited = getParameter(request, "ewnodelastedited");
- addToRequest(request, "showpage", ewnodelastedited);
- ActionForward ret = mapping.findForward(SUCCESS);
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
return ret;
}
}
-
@Override
public String getRequiredRankStr() {
return ADMINISTRATOR;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
