[portal-commits] JBoss Portal SVN: r7779 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 10:26:13 -0400 (Mon, 16 Jul 2007)
New Revision: 7779
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
Log:
JBPORTAL-1509: Window name set the previously defined value when content-type has changed
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-07-16
10:10:08 UTC (rev 7778)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-07-16
14:26:13 UTC (rev 7779)
@@ -273,6 +273,8 @@
Window tmp = (Window)windows.get(i);
tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, ""
+ i);
}
+
+ this.windowName = "";
}
catch (DuplicatePortalObjectException unexpected)
{
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-16
10:10:08 UTC (rev 7778)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-16
14:26:13 UTC (rev 7779)
@@ -42,11 +42,13 @@
</td>
<td>
<h:form id="abc">
+ <h:inputHidden id="windowNameCopy"
value="#{pageManager.windowName}"/>
<h:selectOneMenu
id="instanceId"
value="#{pageManager.selectedContentType}"
styleClass="portlet-form-field contentType"
-
onchange="document.getElementById('abc').submit()">
+
onchange="document.getElementById('abc:windowNameCopy').value =
document.getElementById('windowForm:windowName').value;
+ document.getElementById('abc').submit();
">
<f:selectItems
value="#{pageManager.contentTypeItems}"/>
</h:selectOneMenu>
<h:message for="instanceId"
errorClass="portlet-msg-error"/>