svn commit: r1709509 - /portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java

Author: taylor
Date: Tue Oct 20 05:31:07 2015
New Revision: 1709509

URL: http://svn.apache.org/viewvc?rev=1709509&view=rev
Log:
JS2-1339: fixing bug in customizer for selecting portlet theme per page

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java?rev=1709509&r1=1709508&r2=1709509&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java Tue Oct 20 05:31:07 2015
@@ -392,12 +392,15 @@ public class MultiColumnPortlet extends
 
             String theme = request.getParameter("theme");
             if (theme != null && theme.length() > 0) {
-                try {
-                    requestPage.updateDefaultDecorator(theme, Fragment.LAYOUT);
-                } catch (Exception e) {
-                    throw new PortletException("Unable to update page: " + e.getMessage(), e);
+                String jsChangeThemeAll = request.getParameter("jsChangeThemeAll");
+                if (jsChangeThemeAll == null) {
+                    try {
+                        requestPage.updateDefaultDecorator(theme, Fragment.LAYOUT);
+                    } catch (Exception e) {
+                        throw new PortletException("Unable to update page: " + e.getMessage(), e);
+                    }
+                    return;
                 }
-                return;
             }
 
             String fragmentId = request.getParameter("fragment");