svn commit: r1819591 - /ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml

Author: jleroux
Date: Sat Dec 30 11:23:40 2017
New Revision: 1819591

URL: http://svn.apache.org/viewvc?rev=1819591&view=rev
Log:
"Applied fix from trunk plugins for revision: 1819589  "
------------------------------------------------------------------------
Fixed: Exception Error rendering on all View Category pages
(OFBIZ-10006)

Steps to regenerate:
1. Open https://demo-trunk.ofbiz.apache.org/ecommerce/control/main
2. Go to Category section
3. Click any category
Exception Error renders

jleroux: the patch fixes the issue in log but the feature still does not work.
I mean when you click on a category in the tree nothing happens.
I see no related js error in browser console.

Thanks: Archana Asthana for report and Aman Agrawal for patch
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml?rev=1819591&r1=1819590&r2=1819591&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml Sat Dec 30 11:23:40 2017
@@ -547,11 +547,9 @@ under the License.
                 <script location="component://order/groovyScripts/entry/catalog/Category.groovy"/>
                 <set field="fromSetSessionLocale" value="${groovy: return request.getAttribute('fromSetSessionLocale');}"/>
                 <set field="visualThemeId" from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/>
-                <service service-name="getVisualThemeResources">
-                    <field-map field-name="visualThemeId"/>
-                    <field-map field-name="themeResources" from-field="layoutSettings"/>
-                </service>
-                <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
+                <set field="visualTheme" value="${groovy: org.apache.ofbiz.widget.model.ThemeFactory.getVisualThemeFromId(visualThemeId)}"/>
+                <set field="modelTheme" value="${groovy: visualTheme.getModelTheme()}"/>
+                <set field="layoutSettings" value="${groovy: modelTheme.getThemeResources()}"/>
             </actions>
             <widgets>
                 <section>