svn commit: r1737156 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy

[jleroux]

Author: jleroux
Date: Wed Mar 30 19:29:24 2016
New Revision: 1737156

URL: http://svn.apache.org/viewvc?rev=1737156&view=rev
Log:
A patch from James Yong for <<Tree showing categories has empty labels>> 
https://issues.apache.org/jira/browse/OFBIZ-6970

Problem
=======
Go to https://localhost:8443/ecommerce/
There are missing labels in the categories section


Modified:
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy?rev=1737156&r1=1737155&r2=1737156&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
 Wed Mar 30 19:29:24 2016
@@ -58,12 +58,12 @@ List fillTree(rootCat ,CatLvl, parentCat
                 context.title = categoryContentWrapper.get("CATEGORY_NAME", 
"html");
                 categoryDescription = 
categoryContentWrapper.get("DESCRIPTION", "html");
                 
-                if(categoryContentWrapper.get("CATEGORY_NAME", "html"))
+                if(categoryContentWrapper.get("CATEGORY_NAME", 
"html").toString())
                     rootMap["categoryName"] = 
categoryContentWrapper.get("CATEGORY_NAME", "html");
                 else
                     rootMap["categoryName"] = root.categoryName;
                 
-                if(categoryContentWrapper.get("DESCRIPTION", "html"))
+                if(categoryContentWrapper.get("DESCRIPTION", 
"html").toString())
                     rootMap["categoryDescription"] = 
categoryContentWrapper.get("DESCRIPTION", "html");
                 else
                     rootMap["categoryDescription"] = root.description;