[ofbiz-framework] branch trunk updated: Improved: Remove hardcoded product category on CategoryWorker.getCatalogTopCategory (OFBIZ-12078)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 0fc14af  Improved: Remove hardcoded product category on CategoryWorker.getCatalogTopCategory (OFBIZ-12078)
0fc14af is described below

commit 0fc14af687754958ca25a2569ee39f1069d712ee
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Fri Dec 25 17:02:52 2020 +0100

    Improved: Remove hardcoded product category on CategoryWorker.getCatalogTopCategory (OFBIZ-12078)
   
    When you call the java function
    org.apache.ofbiz.product.category.CategoryWorker.getCatalogTopCategory()
    the catalog returned if the system failed found it is hardcoded and don't use an
    existing property : catalog->top.category.default
   
    Thanks: Nicolas
---
 .../main/java/org/apache/ofbiz/product/category/CategoryWorker.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
index 1f4f342..2ed9f01 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
@@ -42,6 +42,7 @@ import org.apache.ofbiz.entity.GenericValue;
 import org.apache.ofbiz.entity.condition.EntityCondition;
 import org.apache.ofbiz.entity.util.EntityQuery;
 import org.apache.ofbiz.entity.util.EntityUtil;
+import org.apache.ofbiz.entity.util.EntityUtilProperties;
 import org.apache.ofbiz.product.product.ProductWorker;
 import org.apache.ofbiz.service.DispatchContext;
 import org.apache.ofbiz.service.ServiceUtil;
@@ -75,7 +76,8 @@ public final class CategoryWorker {
             topCatName = defaultTopCategory;
         }
         if (topCatName == null) {
-            topCatName = "CATALOG1";
+            topCatName = EntityUtilProperties.getPropertyValue("catalog", "top.category.default", "CATALOG1",
+                    (Delegator) request.getAttribute("delegator"));
         }
 
         if (!fromSession) {