Author: thomas.heute(a)jboss.com
Date: 2007-03-27 07:43:01 -0400 (Tue, 27 Mar 2007)
New Revision: 6841
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
Log:
Keep window name and target region defined when navigating for content
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-03-27
10:26:44 UTC (rev 6840)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-03-27
11:43:01 UTC (rev 6841)
@@ -36,6 +36,7 @@
import org.jboss.portal.theme.PortalLayout;
import org.jboss.portal.theme.LayoutService;
import org.jboss.portal.faces.component.portlet.PortletActionEvent;
+import org.jboss.portal.faces.component.portlet.PortletRenderEvent;
import org.jboss.portal.faces.el.dynamic.DynamicBean;
import org.jboss.portal.faces.el.PropertyValue;
import org.jboss.portal.portlet.PortletInvoker;
@@ -215,15 +216,54 @@
assignedWindows.values.clear();
}
+ private String windowName;
+ private String targetRegion;
+
+ public String getWindowName()
+ {
+ return windowName;
+ }
+
+ public void setWindowName(String windowName)
+ {
+ this.windowName = windowName;
+ }
+
+ public String getTargetRegion()
+ {
+ return targetRegion;
+ }
+
+ public void setTargetRegion(String targetRegion)
+ {
+ this.targetRegion = targetRegion;
+ }
+
+
/**
* Portlet event
*/
public void assignWindow(ActionEvent event)
{
- if (event instanceof PortletActionEvent)
+ if (event instanceof PortletRenderEvent)
{
+ PortletRenderEvent renderEvent = (PortletRenderEvent)event;
+ Map renderParams = renderEvent.getParameterMap();
+
+ // Keep window name and region defined
+ setWindowName(((String[])renderParams.get("windowName"))[0]);
+ setTargetRegion(((String[])renderParams.get("targetRegion"))[0]);
+ }
+ else if (event instanceof PortletActionEvent)
+ {
+
PortletActionEvent actionEvent = (PortletActionEvent)event;
Map actionParams = actionEvent.getParameterMap();
+
+ // Keep window name and region defined
+ setWindowName(((String[])actionParams.get("windowName"))[0]);
+ setTargetRegion(((String[])actionParams.get("targetRegion"))[0]);
+
if (actionParams.get(CONTENT_ACTION_SELECT) != null)
{
String[] uris = (String[])actionParams.get(CONTENT_URI);
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-03-27
10:26:44 UTC (rev 6840)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-03-27
11:43:01 UTC (rev 6841)
@@ -112,8 +112,7 @@
</td>
<td class="widget">
<h:form id="windowForm">
- <h:inputText id="windowName"
value="#{assignWindowsAction.windowName}"
- styleClass="portlet-form-input-field"/>
+ <h:inputText id="windowName"
value="#{pageManager.windowName}"
styleClass="portlet-form-input-field"/>
<h:message for="windowName"
errorClass="portlet-msg-error"/>
</h:form>
</td>
@@ -124,7 +123,7 @@
</td>
<td class="widget">
<h:form id="regionForm">
- <h:selectOneMenu id="targetRegion"
styleClass="portlet-form-input-field">
+ <h:selectOneMenu id="targetRegion"
value="#{pageManager.targetRegion}"
styleClass="portlet-form-input-field">
<f:selectItems value="#{pageManager.regionItems}"/>
</h:selectOneMenu>
<h:message for="targetRegion"
errorClass="portlet-msg-error"/>
Show replies by date