Author: billyxie
Date: 2010-03-19 04:38:53 +0100 (Fri, 19 Mar 2010)
New Revision: 41529
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/SubSiteTreeItemRenderer.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages_newbuttons.jsp
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
Log:
CMSC-1577 - Error when exiting personalpage editwizards
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 03:38:53 UTC (rev 41529)
@@ -29,12 +29,13 @@
String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
+ String from = getParameter(request, "from");
if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentpage", parentpage);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
- + "&contenttype=personalpage" + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ + "&contenttype=personalpage" + "&returnurl=" +
mapping.findForward("returnurl").getPath() + "?from=" + from);
ret.setRedirect(true);
return ret;
}
@@ -50,11 +51,11 @@
SubSiteUtil.createPersonalPageContentChannel(newPage);
addToRequest(request, "showsubsite", ewnodelastedited);
- ActionForward ret = mapping.findForward(SUCCESS);
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from);
return ret;
}
request.getSession().removeAttribute("parentpage");
- ActionForward ret = mapping.findForward(CANCEL);
+ ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from);
return ret;
}
}
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 03:38:53 UTC (rev 41529)
@@ -51,6 +51,10 @@
String subsite = (String) request.getSession().getAttribute("subsite");
request.getSession().removeAttribute("subsite");
+ String from = request.getParameter("from");
+ if (StringUtils.isBlank(subsite) || !cloud.hasNode(subsite)) {
+ subsite = request.getParameter("subsite");
+ }
/* Purpose of this file
* - retrieve list of subsites
@@ -79,6 +83,9 @@
if (subsiteNode != null){
request.setAttribute("subsite",
String.valueOf(subsiteNode.getNumber()));
}
+ if (from != null) {
+ request.setAttribute("from", from);
+ }
if (subsiteNode == null){ //If there are no subsites at all, return
empty list
searchForm.setResultCount(0);
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-19 03:38:53 UTC (rev 41529)
@@ -32,6 +32,10 @@
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ String from = request.getParameter("from");
+ if (from != null) {
+ request.setAttribute("from", from);
+ }
if (isRemoveAction(request)) {
String objectnumber = getParameter(request, "number", true);
Node subsiteNode = cloud.getNode(objectnumber);
@@ -43,24 +47,15 @@
if (isEditor) {
NavigationUtil.deleteItem(subsiteNode);
}
- if ("frommodule".equalsIgnoreCase(getParameter(request,
"fromModule"))) {
- return mapping.findForward("modulesuccess");
- } else {
- return mapping.findForward(SUCCESS);
- }
+ return mapping.findForward(SUCCESS);
}
if (isCancelAction(request)) {
- if ("frommodule".equalsIgnoreCase(getParameter(request,
"fromModule"))) {
- return mapping.findForward("modulesuccess");
- } else {
- return mapping.findForward(SUCCESS);
- }
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from);
}
- request.setAttribute("fromModule", getParameter(request, "fromModule"));
// neither remove or cancel, show confirmation page
- return mapping.findForward("delete");
+ return new ActionForward(mapping.findForward("delete").getPath() +
"?from=" + from);
}
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
2010-03-19 03:38:53 UTC (rev 41529)
@@ -29,19 +29,17 @@
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() + "?fromModule="
- + request.getParameter("fromModule"));
+ + objectnumber + "&returnurl=" +
mapping.findForward("returnurl").getPath()+"?from=" +
request.getParameter("from"));
ret.setRedirect(true);
return ret;
} else {
String ewnodelastedited = getParameter(request, "ewnodelastedited");
addToRequest(request, "showsubsite", ewnodelastedited);
- if ("frommodule".equalsIgnoreCase(getParameter(request,
"fromModule"))) {
- return mapping.findForward("modulesuccess");
- } else {
- return mapping.findForward(SUCCESS);
- }
+ if ("site".equalsIgnoreCase(getParameter(request, "from"))) {
+ return mapping.findForward(SUCCESS);
+ } else {
+ return mapping.findForward("modulesuccess");
}
+ }
}
-
}
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/SubSiteTreeItemRenderer.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/SubSiteTreeItemRenderer.java
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/SubSiteTreeItemRenderer.java
2010-03-19 03:38:53 UTC (rev 41529)
@@ -59,9 +59,9 @@
element.addOption(renderer.createTreeOption("delete.png",
"site.sub.remove",
RESOURCEBUNDLE, "../subsite/SubSiteDelete.do?number=" + id));
element.addOption(renderer.createTreeOption("subsite_new.png",
"site.personal.new.page",
- RESOURCEBUNDLE,
"../subsite/PersonalPageCreate.do?parentpage=" + id));
+ RESOURCEBUNDLE,
"../subsite/PersonalPageCreate.do?parentpage=" + id + "&from=site"));
element.addOption(renderer.createTreeOption("personalpage_go.png",
"site.personal.showpages",
- RESOURCEBUNDLE, "../subsite/SubSiteAction.do?subsite=" +
id));
+ RESOURCEBUNDLE, "../subsite/SubSiteAction.do?subsite=" + id
+ "&from=site"));
}
if (SecurityUtil.isChiefEditor(role)) {
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
2010-03-19 03:38:53 UTC (rev 41529)
@@ -25,14 +25,13 @@
validate="false">
<forward name="openwizard"
path="/editors/WizardInitAction.do" redirect="false" />
<forward name="returnurl"
path="/editors/subsite/SubSiteEdit.do" redirect="false" />
- <forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
+ <forward name="success"
path="/editors/subsite/refreshandshow.jsp" redirect="false" />
<forward name="modulesuccess"
path="/editors/subsite/SubSiteAction.do" redirect="false" />
</action>
<action path="/editors/subsite/SubSiteDelete"
type="com.finalist.cmsc.subsite.forms.SubSiteDelete"
unknown="false" validate="false">
<forward name="delete"
path="/editors/subsite/subsitedelete.jsp" redirect="false" />
- <forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
- <forward name="modulesuccess"
path="/editors/subsite/SubSiteAction.do" redirect="false" />
+ <forward name="success"
path="/editors/subsite/SubSiteAction.do" redirect="false" />
</action>
<action path="/editors/subsite/PersonalPageCreate"
type="com.finalist.cmsc.subsite.forms.PersonalPageCreate"
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
2010-03-19 03:38:53 UTC (rev 41529)
@@ -39,8 +39,8 @@
<mm:import externid="returnurl"/>
<mm:import externid="subsite" from="parameters" />
+<mm:import externid="from" from="parameters" />
-
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
<div class="content">
@@ -74,6 +74,7 @@
<html:hidden property="pager.offset" value="${pagerDOToffset}"/>
<html:hidden property="order"/>
<html:hidden property="direction"/>
+ <input type="hidden" name="from" value="${from}" />
<mm:present referid="returnurl"><input type="hidden" name="returnurl"
value="<mm:write referid="returnurl"/>"/></mm:present>
<table>
@@ -147,7 +148,7 @@
<td style="white-space: nowrap;">
<mm:field name="number" write="false" id="nodenumber">
- <a
href="../subsite/SubSiteEdit.do?fromModule=frommodule&number=${nodenumber}&subsite=${subsite}"
+ <a
href="../subsite/SubSiteEdit.do?number=${nodenumber}&from=${from}&subsite=${subsite}"
title="<fmt:message key="pp.content.edit" />"><img
src="../gfx/icons/edit.png" width="16" height="16"
title="<fmt:message key="pp.content.edit" />"
alt="<fmt:message key="pp.content.edit" />"/></a>
@@ -159,7 +160,7 @@
title="<fmt:message key="pp.content.preview" />"
alt="<fmt:message
key="pp.content.preview" />"/></a>
</c:if>
- <a
href="../subsite/SubSiteDelete.do?fromModule=frommodule&number=${nodenumber}"
+ <a
href="../subsite/SubSiteDelete.do?number=${nodenumber}&from=${from}"
title="<fmt:message key="pp.content.delete" />"><img
src="../gfx/icons/delete.png" width="16" height="16"
title="<fmt:message key="pp.content.delete" />"
alt="<fmt:message key="pp.content.delete" />"/></a>
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages_newbuttons.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages_newbuttons.jsp
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages_newbuttons.jsp
2010-03-19 03:38:53 UTC (rev 41529)
@@ -1,5 +1,5 @@
<ul class="shortcuts">
<li class="new" style="text-decoration: none;">
-<a href="../subsite/PersonalPageCreate.do?parentpage=${subsite}" ><fmt:message
key="site.personal.new.page" /></a>
+<a href="../subsite/PersonalPageCreate.do?parentpage=${subsite}&from=${from}"
><fmt:message key="site.personal.new.page" /></a>
</li>
</ul>
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
2010-03-19 03:38:53 UTC (rev 41529)
@@ -11,6 +11,7 @@
<mm:import externid="number" required="true" from="parameters"/>
<mm:cloud jspvar="cloud" rank="basic user" loginpage="../login.jsp">
<body>
+<mm:import externid="from" from="parameters" />
<cmscedit:sideblock title="subsitedelete.title" titleClass="side_block_green">
<p>
<fmt:message key="subsitedelete.subtitle" /> <mm:node
referid="number"><b><mm:field name="title"/></b></mm:node>
@@ -20,7 +21,7 @@
</p>
<form action="?">
<html:hidden property="number" value="${number}" />
- <html:hidden property="fromModule" value="${fromModule}" />
+ <html:hidden property="from" value="${from}" />
<html:submit property="remove"><fmt:message
key="subsitedelete.yes"/></html:submit>
<html:submit property="cancel"><fmt:message
key="subsitedelete.no"/></html:submit>
</form>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
