Author: raintang Date: 2009-12-01 07:22:00 +0100 (Tue, 01 Dec 2009) New Revision: 40051
Modified: CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java Log: CMSC-1577 Error when exiting personalpage editwizards Modified: CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java =================================================================== --- CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java 2009-12-01 06:21:19 UTC (rev 40050) +++ CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java 2009-12-01 06:22:00 UTC (rev 40051) @@ -49,7 +49,8 @@ // Initialize SearchForm searchForm = (SearchForm) form; - String subsite = request.getParameter("subsite"); + String subsite = (String) request.getSession().getAttribute("subsite"); + request.getSession().removeAttribute("subsite"); /* Purpose of this file * - retrieve list of subsites Modified: CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java =================================================================== --- CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java 2009-12-01 06:21:19 UTC (rev 40050) +++ CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java 2009-12-01 06:22:00 UTC (rev 40051) @@ -26,9 +26,11 @@ if (StringUtils.isBlank(action)) { String objectnumber = getParameter(request, "number", true); + String subsite = request.getParameter("subsite"); + request.getSession().setAttribute("subsite", subsite); ActionForward ret = new ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" - + objectnumber + "&returnurl=" + mapping.findForward("returnurl").getPath() + "?subsite=" - + request.getParameter("subsite")); + + objectnumber + "&returnurl=" + mapping.findForward("returnurl").getPath() + "?fromModule=" + + request.getParameter("fromModule")); ret.setRedirect(true); return ret; } else { _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs