Author: jleroux
Date: Wed Mar 30 19:32:09 2016
New Revision: 1737158
URL:
http://svn.apache.org/viewvc?rev=1737158&view=revLog:
"Applied fix from trunk for revision: 1737156 "
------------------------------------------------------------------------
r1737156 | jleroux | 2016-03-30 21:29:24 +0200 (mer. 30 mars 2016) | 8 lignes
A patch from James Yong for <<Tree showing categories has empty labels>>
https://issues.apache.org/jira/browse/OFBIZ-6970Problem
=======
Go to
https://localhost:8443/ecommerce/There are missing labels in the categories section
------------------------------------------------------------------------
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 30 19:32:09 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,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1737156
Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy?rev=1737158&r1=1737157&r2=1737158&view=diff==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy Wed Mar 30 19:32:09 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;
Locked
