Re: svn commit: r797877 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl

[Jacopo Cappellato]

Yes you are right Ashish
Using mergefromtrunk I got a conflict, I don't have time now but I  
will look at this hopefully soon.

Jacopo

On Jul 26, 2009, at 12:26 PM, Ashish Vijaywargiya wrote:

Hello Jacopo,

Shouldn't we back port this to release branch 9.04?
Thanks !

--
Ashish

On Sun, Jul 26, 2009 at 1:49 PM, <jaco...@apache.org> wrote:

Author: jacopoc
Date: Sun Jul 26 08:19:09 2009
New Revision: 797877

URL: http://svn.apache.org/viewvc?rev=797877&view=rev
Log:
Fixes to avoid duplicated category id for top level categories.

Modified:

ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ 
sidedeepcategory.ftl

Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ 
sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?rev=797877&r1=797876&r2=797877&view=diff

= 
= 
= 
= 
= 
= 
= 
= 
= 
=====================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ 
sidedeepcategory.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ 
sidedeepcategory.ftl
Sun Jul 26 08:19:09 2009
@@ -44,8 +44,13 @@
     <div class="browsecategorylist">
 </#if>
       <li class="browsecategorytext">
-          <a
href="$ 
{Static 
["org 
.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request,
"", category.productCategoryId, parentCategory.productCategoryId)}"
class="${browseCategoryButtonClass}"><#if
categoryName?has_content>${categoryName}<#else>$ 
{categoryDescription?default("")}</#if></a>
-
+          <#if parentCategory?has_content>
+            <#assign parentCategoryId =  
parentCategory.productCategoryId/>
+          <#else>
+            <#assign parentCategoryId = ""/>
+          </#if>
+          <a
href="$ 
{Static 
["org 
.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request,
"", category.productCategoryId, parentCategoryId)}"
class="${browseCategoryButtonClass}"><#if
categoryName?has_content>${categoryName}<#else>$ 
{categoryDescription?default("")}</#if></a>
+
 <#if
(Static 
["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request,
category.getString("productCategoryId"))) || (curCategoryId?exists &&
curCategoryId == category.productCategoryId)>
   <#local subCatList =
Static 
["org 
.ofbiz 
.product.category.CategoryWorker"].getRelatedCategoriesRet(request,
"subCatList", category.getString("productCategoryId"), true)>
   <#if subCatList?exists>
@@ -70,7 +75,7 @@
   <div class="screenlet-body">
       <ul class="browsecategorylist">
         <#list topLevelList as category>
-            <@categoryList parentCategory=category category=category
wrapInBox="N"/>
+            <@categoryList parentCategory="" category=category
wrapInBox="N"/>
         </#list>
       </ul>
   </div>