svn commit: r1724569 - in /ofbiz/branches/release15.12: ./ specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl

Author: jleroux
Date: Thu Jan 14 09:57:56 2016
New Revision: 1724569

URL: http://svn.apache.org/viewvc?rev=1724569&view=rev
Log:
"Applied fix from trunk for revision: 1724566"
------------------------------------------------------------------------
r1724566 | jleroux | 2016-01-14 10:49:48 +0100 (jeu. 14 janv. 2016) | 5 lignes

An augmented patch from Jason Reast-Jones for "Broken filter links if using ecommerce Layered Navigation" https://issues.apache.org/jira/browse/OFBIZ-6798

If you enable Layered Navigation in the ecommerce (via CatalogScreens.xml) the Sub-Category and color filter links have no closing </a> tag.

jleroux: I had also to change LayeredNavigation.groovy
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy
    ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 14 09:57:56 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1724402,1724411
+/ofbiz/trunk:1722712,1724402,1724411,1724566

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy?rev=1724569&r1=1724568&r2=1724569&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy Thu Jan 14 09:57:56 2016
@@ -59,7 +59,7 @@ if (searchCategoryId) {
     productCategoryRollups = from("ProductCategoryRollup").where("productCategoryId", searchCategoryId).filterByDate().queryList();
     previousCategoryId = null;
     if (productCategoryRollups) {
-        for (GenericValue categoryRollup : productCategoryRollups) {
+        for (categoryRollup in productCategoryRollups) {
             categoryConstraint = new ProductSearch.CategoryConstraint(categoryRollup.parentProductCategoryId, true, false);
             if (searchConstraintList.contains(categoryConstraint)) {
                 previousCategoryId = categoryRollup.parentProductCategoryId;

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl?rev=1724569&r1=1724568&r2=1724569&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl Thu Jan 14 09:57:56 2016
@@ -46,7 +46,7 @@ under the License.
           <#list subCategoryList as category>
             <#assign subCategoryContentWrapper = category.categoryContentWrapper />
             <#assign categoryName = subCategoryContentWrapper.get("CATEGORY_NAME", "html")!?string />
-            <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?SEARCH_CATEGORY_ID${index}=${category.productCategoryId}&amp;searchCategoryId=${category.productCategoryId}&amp;clearSearch=N</@ofbizUrl>">${categoryName!} (${category.count})</li>
+            <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?SEARCH_CATEGORY_ID${index}=${category.productCategoryId}&amp;searchCategoryId=${category.productCategoryId}&amp;clearSearch=N</@ofbizUrl>">${categoryName!} (${category.count})</a></li>
           </#list>
         </ul>
       </div>
@@ -56,7 +56,7 @@ under the License.
         <strong>${colorFeatureType.description}</strong>
         <ul>
           <#list colors as color>
-            <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?pft_${color.productFeatureTypeId}=${color.productFeatureId}&amp;clearSearch=N<#if currentSearchCategory??>&amp;searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>">${color.description} (${color.featureCount})</li>
+            <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?pft_${color.productFeatureTypeId}=${color.productFeatureId}&amp;clearSearch=N<#if currentSearchCategory??>&amp;searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>">${color.description} (${color.featureCount})</a></li>
           </#list>
         </ul>
       </div>