Author: ate
Date: Wed Dec 12 16:52:21 2007
New Revision: 603791
URL: http://svn.apache.org/viewvc?rev=603791&view=rev
Log:
Fixing broken /portal PageCustomizer action "Change Portlets Theme"
Modified:
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
Modified:
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=603791&r1=603790&r2=603791&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Wed Dec 12 16:52:21 2007
@@ -186,7 +186,7 @@
<option value='$pd' #if ($pd == $fd) SELECTED #end>$pd
#end
</select>
- <input type="submit" name="jsSubmitTheme"
value="$messages.getString("portal.page.editing.changethemeall")"/>
+ <input type="submit" name="jsChangeThemeAll"
value="$messages.getString("portal.page.editing.changethemeall")"/>
</div>
#end
#if($allowAddLayout||$allowChangeLayout)
Modified:
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java?rev=603791&r1=603790&r2=603791&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
(original)
+++
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
Wed Dec 12 16:52:21 2007
@@ -926,68 +926,69 @@
}
return;
}
- // evlach
+ }
+
+ // change style for all pages in user folder
+ String jsChangeUserPagesTheme =
request.getParameter("jsChangeUserPagesTheme");
+ if ( jsChangeUserPagesTheme != null )
+ {
+ String user_pages_theme =
request.getParameter("user_pages_theme");
+ try
+ {
+ Folder f =
pageManager.getUserFolder(request.getRemoteUser());
+ applyStyle(f,user_pages_theme,Fragment.LAYOUT);
+ }
+ catch (Exception e)
+ {
+ throw new PortletException("Unable to update folder for
defUserLayoutDeco decorator: "+e.getMessage(), e);
+ }
+ return;
+ }
+ String jsChangeUserPortletsDeco =
request.getParameter("jsChangeUserPortletsDeco");
+ if ( jsChangeUserPortletsDeco != null )
+ {
+ String user_portlets_deco =
request.getParameter("user_portlets_deco");
+ try
+ {
+ Folder f =
pageManager.getUserFolder(request.getRemoteUser());
+ applyStyle(f,user_portlets_deco,Fragment.PORTLET);
+ }
+ catch (Exception e)
+ {
+ throw new PortletException("Unable to update folder for
defUserPortletDeco decorator: "+e.getMessage(), e);
+ }
+ return;
+ }
+
+ String jsChangeThemeAll = request.getParameter("jsChangeThemeAll");
+ if (jsChangeThemeAll != null)
+ {
String decorators = request.getParameter("decorators");
- // change style for all pages in user folder
- String jsChangeUserPagesTheme =
request.getParameter("jsChangeUserPagesTheme");
- if ( jsChangeUserPagesTheme != null )
+ Iterator fragmentsIter =
requestPage.getRootFragment().getFragments().iterator();
+ while(fragmentsIter.hasNext())
{
- String user_pages_theme =
request.getParameter("user_pages_theme");
- try
+ Fragment fragment = (Fragment) fragmentsIter.next();
+ if ( fragment == null )
{
- Folder f =
pageManager.getUserFolder(request.getRemoteUser());
- applyStyle(f,user_pages_theme,Fragment.LAYOUT);
- decorators=null;
+ // ignore no longer consistent page definition
+ return;
}
- catch (Exception e)
- {
- throw new PortletException("Unable to update folder for
defUserLayoutDeco decorator: "+e.getMessage(), e);
- }
- }
- String jsChangeUserPortletsDeco =
request.getParameter("jsChangeUserPortletsDeco");
- if ( jsChangeUserPortletsDeco != null )
- {
- String user_portlets_deco =
request.getParameter("user_portlets_deco");
- try
- {
- Folder f =
pageManager.getUserFolder(request.getRemoteUser());
- applyStyle(f,user_portlets_deco,Fragment.PORTLET);
- decorators = null; //do insert next if
- }
- catch (Exception e)
- {
- throw new PortletException("Unable to update folder
for defUserPortletDeco decorator: "+e.getMessage(), e);
- }
- }
-
- if ( decorators != null && decorators.length() > 1)
+
+ if (decorators.trim().length() == 0)
+ fragment.setDecorator(null);
+ else
+ fragment.setDecorator(decorators);
+ }
+ try
{
- Iterator fragmentsIter =
requestPage.getRootFragment().getFragments().iterator();
- while(fragmentsIter.hasNext())
- {
- Fragment fragment = (Fragment) fragmentsIter.next();
- if ( fragment == null )
- {
- // ignore no longer consistent page definition
- return;
- }
-
- if (decorators.trim().length() == 0)
- fragment.setDecorator(null);
- else
- fragment.setDecorator(decorators);
- }
- try
- {
- pageManager.updatePage(requestPage);
- }
- catch (Exception e)
- {
- throw new PortletException("Unable to update page for
fragment decorator: "+e.getMessage(), e);
- }
- return;
- }
- }
+ pageManager.updatePage(requestPage);
+ }
+ catch (Exception e)
+ {
+ throw new PortletException("Unable to update page for
fragment decorator: "+e.getMessage(), e);
+ }
+ return;
+ }
String portlets = request.getParameter("portlets");
if ( portlets != null && portlets.length() > 0 )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
