svn commit: r463150 - in /incubator/ofbiz/trunk/applications: ecommerce/webapp/ecommerce/catalog/ order/webapp/ordermgr/entry/catalog/ product/webapp/catalog/find/

jleroux Thu, 12 Oct 2006 01:08:08 -0700

Author: jleroux
Date: Thu Oct 12 01:07:46 2006
New Revision: 463150

URL: http://svn.apache.org/viewvc?view=rev&rev=463150
Log:
Followong Si's (revision 462908), fix potential bug when some categories might 
not have content wrappers


Modified:
    
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
    
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
    
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
    
incubator/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl

Modified: 
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?view=diff&rev=463150&r1=463149&r2=463150
==============================================================================
--- 
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
 (original)
+++ 
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
 Thu Oct 12 01:07:46 2006
@@ -26,7 +26,7 @@
   
   <#if curCategoryId?exists && curCategoryId == category.productCategoryId>
     <div class="browsecategorytext">
-        <#if catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>       
 
+        <#if catContentWrappers?exists && 
catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>       
 
             -&nbsp;<a 
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
         <#else>          
             -&nbsp;<a 
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 class="browsecategorybuttondisabled">${category.description?if_exists}</a>
@@ -34,7 +34,7 @@
     </div>
   <#else>
     <div class="browsecategorytext">
-        <#if catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> 
+        <#if catContentWrappers?exists && 
catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> 
             -&nbsp;<a 
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
         <#else>          
             -&nbsp;<a 
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 class="browsecategorybutton">${category.description?if_exists}</a>

Modified: 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?view=diff&rev=463150&r1=463149&r2=463150
==============================================================================
--- 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
 (original)
+++ 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
 Thu Oct 12 01:07:46 2006
@@ -26,13 +26,13 @@
 
   <#if 
(Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, 
category.getString("productCategoryId"))) || (curCategoryId?exists && 
curCategoryId == category.productCategoryId)>
     <#if curCategoryId?exists && curCategoryId == category.productCategoryId>
-        <#if catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>       
 
+        <#if catContentWrappers?exists && 
catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>       
 
             -> <a 
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 
class="buttontextdisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
         <#else>          
             -> <a 
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 class="buttontextdisabled">${category.description?if_exists}</a>
         </#if>          
     <#else>
-        <#if catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> 
+        <#if catContentWrappers?exists && 
catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> 
             -> <a 
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 
class="linktext">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
         <#else>          
             -> <a 
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 class="linktext">${category.description?if_exists}</a>

Modified: 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?view=diff&rev=463150&r1=463149&r2=463150
==============================================================================
--- 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
 (original)
+++ 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
 Thu Oct 12 01:07:46 2006
@@ -25,7 +25,7 @@
   </#if>
   <#if curCategoryId?exists && curCategoryId == category.productCategoryId>
     <div class="browsecategorytext">
-     <#if catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+     <#if catContentWrappers?exists && 
catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
        <#if sessionAttributes.shoppingCart?exists && 
sessionAttributes.shoppingCart.isPurchaseOrder()>
          -&nbsp;<a 
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
        <#else>

Modified: 
incubator/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl?view=diff&rev=463150&r1=463149&r2=463150
==============================================================================
--- 
incubator/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
 (original)
+++ 
incubator/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
 Thu Oct 12 01:07:46 2006
@@ -23,7 +23,7 @@
   </#if>
   <#if curCategoryId?exists && curCategoryId == category.productCategoryId>
     <div class="browsecategorytext">
-        <#if catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+        <#if catContentWrappers?exists && 
catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
           -&nbsp;<a 
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}
 [${category.productCategoryId}]</a>
           <#else>          
           -&nbsp;<a 
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 class="browsecategorybuttondisabled">${category.description?if_exists} 
[${category.productCategoryId}]</a>
@@ -31,7 +31,7 @@
     </div>
   <#else>
     <div class="browsecategorytext">
-        <#if catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+        <#if catContentWrappers?exists && 
catContentWrappers[category.productCategoryId]?exists && 
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
           -&nbsp;<a 
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}
 [${category.productCategoryId}]</a>            
         <#else>          
           -&nbsp;<a 
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
 class="browsecategorybutton">${category.description?if_exists} 
[${category.productCategoryId}]</a>

svn commit: r463150 - in /incubator/ofbiz/trunk/applications: ecommerce/webapp/ecommerce/catalog/ order/webapp/ordermgr/entry/catalog/ product/webapp/catalog/find/

Reply via email to