Author: ate
Date: Thu Dec 10 10:45:18 2009
New Revision: 889175
URL: http://svn.apache.org/viewvc?rev=889175&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084:
Resurrecting PortletPreference based customization of layout template
selection, needed to support page/psml level specialized decorations
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java?rev=889175&r1=889174&r2=889175&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
Thu Dec 10 10:45:18 2009
@@ -212,7 +212,12 @@
JetspeedPowerTool jpt = getJetspeedPowerTool(request, response);
if (maximized)
{
- viewPage = getCachedLayoutViewPage(request,
PortalReservedParameters.PAGE_LAYOUT_MAX);
+ viewPage = getCachedLayoutViewPage(request,
PortalReservedParameters.PAGE_LAYOUT_MAX);
+ if (viewPage == null)
+ {
+ PortletPreferences prefs = request.getPreferences();
+ viewPage = prefs.getValue(PARAM_MAX_PAGE, null);
+ }
if (viewPage == null)
{
viewPage = (this.supportsAjax) ? this.ajaxMaxLayout :
this.getInitParameter(PARAM_MAX_PAGE);
@@ -226,6 +231,11 @@
viewPage = getCachedLayoutViewPage(request,
PortalReservedParameters.PAGE_LAYOUT_SOLO);
if (viewPage == null)
{
+ PortletPreferences prefs = request.getPreferences();
+ viewPage = prefs.getValue(PARAM_SOLO_PAGE, null);
+ }
+ if (viewPage == null)
+ {
viewPage = (this.supportsAjax) ? this.ajaxSoloLayout :
this.getInitParameter(PARAM_SOLO_PAGE);
if (viewPage == null)
{
@@ -239,6 +249,11 @@
viewPage = getCachedLayoutViewPage(request,
PortalReservedParameters.PAGE_LAYOUT_VIEW);
if (viewPage == null)
{
+ PortletPreferences prefs = request.getPreferences();
+ viewPage = prefs.getValue(PARAM_VIEW_PAGE, null);
+ }
+ if (viewPage == null)
+ {
viewPage = (this.supportsAjax) ? this.ajaxViewLayout :
this.getInitParameter(PARAM_VIEW_PAGE);
if (viewPage == null)
viewPage = "columns";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
