svn commit: r1724566 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce: WEB-INF/actions/catalog/LayeredNavigation.groovy catalog/LayeredNavBar.ftl

[jleroux]

Author: jleroux
Date: Thu Jan 14 09:49:48 2016
New Revision: 1724566

URL: http://svn.apache.org/viewvc?rev=1724566&view=rev
Log:
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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy?rev=1724566&r1=1724565&r2=1724566&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy
 Thu Jan 14 09:49:48 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl?rev=1724566&r1=1724565&r2=1724566&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl 
(original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl 
Thu Jan 14 09:49:48 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>