Author: kevinshen
Date: 2010-03-09 04:10:09 +0100 (Tue, 09 Mar 2010)
New Revision: 41302
Modified:
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/refreshandshow.jsp
Log:
CMSC-1577 Error when exiting personalpage editwizards
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-09 03:09:59 UTC (rev 41301)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
2010-03-09 03:10:09 UTC (rev 41302)
@@ -26,7 +26,7 @@
<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="modulesuccess"
path="/editors/subsite/SubSiteAction.do" redirect="false" />
+ <forward name="modulesuccess"
path="/editors/subsite/refreshandshow.jsp" redirect="false" />
</action>
<action path="/editors/subsite/SubSiteDelete"
type="com.finalist.cmsc.subsite.forms.SubSiteDelete"
unknown="false" validate="false">
@@ -40,13 +40,13 @@
<forward name="openwizard" path="/editors/WizardInitAction.do"
redirect="false" />
<forward name="returnurl"
path="/editors/subsite/PersonalPageCreate.do" redirect="false" />
<forward name="cancel" path="/editors/subsite/SubSiteAction.do"
redirect="true" />
- <forward name="success" path="/editors/subsite/SubSiteAction.do"
redirect="false" />
+ <forward name="success" path="/editors/subsite/refreshandshow.jsp"
redirect="false" />
</action>
<action path="/editors/subsite/PersonalPageEdit"
type="com.finalist.cmsc.subsite.forms.PersonalPageEdit" unknown="false"
validate="false">
<forward name="openwizard" path="/editors/WizardInitAction.do"
redirect="false" />
<forward name="returnurl" path="/editors/subsite/PersonalPageEdit.do"
redirect="false" />
- <forward name="success" path="/editors/subsite/SubSiteAction.do"
redirect="false" />
+ <forward name="success" path="/editors/subsite/refreshandshow.jsp"
redirect="false" />
</action>
<action path="/editors/subsite/SubSiteAction"
type="com.finalist.cmsc.subsite.forms.SubSiteAction"
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
2010-03-09 03:09:59 UTC (rev 41301)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
2010-03-09 03:10:09 UTC (rev 41302)
@@ -12,12 +12,41 @@
<cmscedit:head title="subsiterefresh.title">
<script type="text/javascript">
function refreshPages() {
- refreshFrame('pages');
+ if( existFrameWithName('pages') ) {
+ refreshFrame('pages');
+ }
if (window.opener) {
window.close();
}
document.location.href = '<mm:write
referid="pagepath"/>';
}
+ function existFrameWithName(name, win, parentcall) {
+ if (!win) {
+ if (!existFrameWithName(name, window)) {
+ return false;
+ }
+ else {
+ return true;
+ }
+ }
+ if (win.name == name) {
+ return true;
+ }
+ else {
+ for (var i = 0; i < win.frames.length; i++) {
+ if(existFrameWithName(name, win.frames[i], true)) {
+ return true;
+ }
+ }
+ if (win.parent && win != parent && !parentcall) {
+ return existFrameWithName(name, win.parent);
+ }
+ if (win.opener) {
+ return existFrameWithName(name, win.opener);
+ }
+ return false;
+ }
+ }
</script>
</cmscedit:head>
<body onload="refreshPages()">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
