[ofbiz-framework] 02/02: Fixed: Convert ProductServices.xml mini lang to groovy: productPriceGenericPermission failed (OFBIZ-10231)

[nm...@apache.org]

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

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

commit 51837c8cbfe57344858ccdfb8a6fcc380318ab19
Author: Nicolas Malin <ni...@nereide.fr>
AuthorDate: Wed Mar 4 21:46:11 2020 +0100

    Fixed: Convert ProductServices.xml mini lang to groovy: productPriceGenericPermission failed
    (OFBIZ-10231)
    
    After groovy conversion the method productPriceGenericPermission failed to validate a user
    
    Problem due to bad call on hasEntityPermission instead of hasPermission
---
 .../product/groovyScripts/product/product/ProductServices.groovy      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/product/groovyScripts/product/product/ProductServices.groovy b/applications/product/groovyScripts/product/product/ProductServices.groovy
index 3182f16..21daa81 100644
--- a/applications/product/groovyScripts/product/product/ProductServices.groovy
+++ b/applications/product/groovyScripts/product/product/ProductServices.groovy
@@ -598,11 +598,11 @@ def productPriceGenericPermission() {
     }
 
     Map result = success()
-    if (!security.hasEntityPermission("CATALOG_PRICE_MAINT", null, parameters.userLogin)) {
+    if (!security.hasPermission("CATALOG_PRICE_MAINT", parameters.userLogin)) {
         result = error(UtilProperties.getMessage("ProductUiLabels",
                 "ProductPriceMaintPermissionError", parameters.locale))
     }
-    result.hasPermission = ServiceUtil.isSuccess(result) && checkProductRelatedPermission(null, null)
+    result.hasPermission = ServiceUtil.isSuccess(result) && checkProductRelatedPermission(parameters.resourceDescription, mainAction)
     if (!result.hasPermission) {
         result = fail(UtilProperties.getMessage("ProductUiLabels", "ProductPermissionError", parameters.locale))
     }