2:03 a.m.
Author: thomas.heute(a)jboss.com
Date: 2008-10-28 03:03:48 -0400 (Tue, 28 Oct 2008)
New Revision: 12193
Modified:
tags/JBoss_Portal_2_7_0/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml
tags/JBoss_Portal_2_7_0/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java
Log:
JBPORTAL-2196: Selecting a portlet in page layout loses any already entered window name
Modified:
tags/JBoss_Portal_2_7_0/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml
===================================================================
---
tags/JBoss_Portal_2_7_0/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-10-28
01:44:06 UTC (rev 12192)
+++
tags/JBoss_Portal_2_7_0/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-10-28
07:03:48 UTC (rev 12193)
@@ -28,43 +28,25 @@
styleClass="portlet-form-input-field
id-window-name"/>
</label>
<h:message for="windowName"
errorClass="portlet-msg-error"/>
- </h:form>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr/>
- #{bundle.COMMON_SELECT_TYPE_CONTENT}:
- </td>
- </tr>
- <tr>
- <td>
- <h:form id="contentTypesForm">
+
+ <hr/>
+ #{bundle.COMMON_SELECT_TYPE_CONTENT}:
+ <br/>
<label for="instanceId"
class="portlet-form-field-label-container">
<span class="portlet-form-field-label
admin-label">#{bundle.COMMON_CONTENT_TYPE}:</span>
- <h:inputHidden id="windowNameCopy"
value="#{pageManager.windowName}"/>
<h:selectOneMenu
id="instanceId"
value="#{pageManager.selectedContentType}"
styleClass="portlet-form-field contentType"
-
onchange="document.getElementById('#{pageManager.namespace}:contentTypesForm:windowNameCopy').value
=
document.getElementById('#{pageManager.namespace}:windowForm:windowName').value;
-
document.getElementById('#{pageManager.namespace}:contentTypesForm').submit();
">
+ onchange="this.form.submit(); ">
<f:selectItems
value="#{pageManager.contentTypeItems}"/>
</h:selectOneMenu>
</label>
<h:message for="instanceId"
errorClass="portlet-msg-error"/>
- </h:form>
- </td>
- </tr>
- <tr>
- <td colspan="2">
+
<hr/>
#{bundle.COMMON_SELECT_CONTENT}:
- </td>
- </tr>
- <tr>
- <td colspan="2" valign="top">
- <h:form></h:form>
+ </h:form>
<jbp:portlet
portletId="#{pageManager.selectedEditorPortletId}"
portletInvoker="#{pageManager.portletInvoker}"
@@ -74,7 +56,8 @@
initialMode="edit_content"
initialWindowState="normal"
renderParameters="#{pageManager.selectedRenderParameters}"
- onClick="url.setParameter('windowName',
document.getElementById('#{pageManager.namespace}:windowForm:windowName').value);"/>
+ onClick="url.setParameter('windowName',
document.getElementById(document.getElementById('namespaceHolder').value +
':windowForm:windowName').value);"/>
+ <input type="hidden"
value="#{pageManager.namespace}" id="namespaceHolder"/>
</td>
</tr>
</table>
Modified:
tags/JBoss_Portal_2_7_0/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java
===================================================================
---
tags/JBoss_Portal_2_7_0/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java 2008-10-28
01:44:06 UTC (rev 12192)
+++
tags/JBoss_Portal_2_7_0/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java 2008-10-28
07:03:48 UTC (rev 12193)
@@ -95,6 +95,18 @@
};
}
}
+ if ("onClick".equals(name))
+ {
+ final String s = attribute.getValue();
+ return new Metadata()
+ {
+ public void applyMetadata(FaceletContext ctx, Object instance)
+ {
+ UIPortlet portlet = (UIPortlet)instance;
+ portlet.setOnClick(s);
+ }
+ };
+ }
return null;
}
});