You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pa...@apache.org on 2020/06/27 19:54:59 UTC
[ofbiz-plugins] branch trunk updated: Improved: Use
GroovyBaseScript's makeValue utility methods in each Groovy files
(OFBIZ-11779) (#33)
This is an automated email from the ASF dual-hosted git repository.
pawan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new d931dfb Improved: Use GroovyBaseScript's makeValue utility methods in each Groovy files (OFBIZ-11779) (#33)
d931dfb is described below
commit d931dfb9c9374d1b3d22bfc9ad9f921b2e9bf438
Author: Priya Sharma <pr...@gmail.com>
AuthorDate: Sun Jun 28 01:24:52 2020 +0530
Improved: Use GroovyBaseScript's makeValue utility methods in each Groovy files (OFBIZ-11779) (#33)
* Improved: Use GroovyBaseScript's makeValue utility methods in each Groovy files(OFBIZ-11779)
* Improved: Removed extra bracket added accidentally. (OFBIZ-11779)
* Update bi/groovyScripts/DimensionServices.groovy
Co-authored-by: Nicolas Malin <nm...@apache.org>
Co-authored-by: Priya Sharma <pr...@hotwaxsystems.com>
Co-authored-by: Nicolas Malin <nm...@apache.org>
---
bi/groovyScripts/DimensionServices.groovy | 6 +++---
ecommerce/groovyScripts/forum/CurrentValPrep.groovy | 2 +-
ecommerce/groovyScripts/forum/EditAddPrep.groovy | 2 +-
ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bi/groovyScripts/DimensionServices.groovy b/bi/groovyScripts/DimensionServices.groovy
index 3bfb300..80150f6 100644
--- a/bi/groovyScripts/DimensionServices.groovy
+++ b/bi/groovyScripts/DimensionServices.groovy
@@ -87,7 +87,7 @@ def loadCurrencyDimension() {
currencyDim.store()
}
} else {
- currencyDim = delegator.makeValue("CurrencyDimension",["dimensionId":currency.uomId])
+ currencyDim = makeValue("CurrencyDimension", [dimensionId: currency.uomId])
currencyDim.currencyId = currency.uomId
currencyDim.description = currency.description
currencyDim.create()
@@ -100,7 +100,7 @@ def prepareProductDimensionData() {
if (product == null) {
return error(UtilProperties.getMessage('ProductUiLabels', 'ProductProductNotFoundWithProduct', locale))
}
- productDimension = delegator.makeValue("ProductDimension")
+ productDimension = makeValue("ProductDimension")
productDimension.setNonPKFields(product)
GenericValue productType = select("description").from("ProductType")
.where("productTypeId", product.productTypeId).cache().queryOne()
@@ -133,4 +133,4 @@ def loadAllProductsInProductDimension() {
inMap.productId = product.productId
run service: "loadProductInProductDimension", with: inMap
}
-}
\ No newline at end of file
+}
diff --git a/ecommerce/groovyScripts/forum/CurrentValPrep.groovy b/ecommerce/groovyScripts/forum/CurrentValPrep.groovy
index e39ffb5..df56420 100644
--- a/ecommerce/groovyScripts/forum/CurrentValPrep.groovy
+++ b/ecommerce/groovyScripts/forum/CurrentValPrep.groovy
@@ -57,7 +57,7 @@ cachedPK = currentEntityMap[currentEntityName]
// Build a key from param or attribute values.
paramMap = UtilHttp.getParameterMap(request)
//logInfo("paramMap:" + paramMap)
-v = delegator.makeValue(currentEntityName)
+v = makeValue(currentEntityName)
passedPK = v.getPrimaryKey()
keyColl = passedPK.getAllKeys()
keyIt = keyColl.iterator()
diff --git a/ecommerce/groovyScripts/forum/EditAddPrep.groovy b/ecommerce/groovyScripts/forum/EditAddPrep.groovy
index 1962ed0..8bd7b63 100644
--- a/ecommerce/groovyScripts/forum/EditAddPrep.groovy
+++ b/ecommerce/groovyScripts/forum/EditAddPrep.groovy
@@ -67,7 +67,7 @@ currentValue = ContentWorker.getSubContentCache(delegator, contentIdTo, mapKey,
if (!currentValue) {
parentValue = from("Content").where("contentId", contentIdTo).cache(true).queryOne()
- currentValue = delegator.makeValue("Content")
+ currentValue = makeValue("Content")
subject = parentValue.contentName
if ("SUMMARY".equals(mapKey)) {
subject = "Short " + subject
diff --git a/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy b/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy
index d9c222b..4abbf8d 100644
--- a/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy
+++ b/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy
@@ -55,7 +55,7 @@ if (!pubPt) {
contentToValue = from("Content").where("contentId", contentIdTo).queryOne()
contentToPurposeList = contentToValue.getRelated("ContentPurpose", null, null, true)
-currentValue = delegator.makeValue("Content", [contentTypeId : "DOCUMENT", statusId : "CTNT_PUBLISHED", privilegeEnumId : "_00_"])
+currentValue = makeValue("Content", [contentTypeId : "DOCUMENT", statusId : "CTNT_PUBLISHED", privilegeEnumId : "_00_"])
if (contentToPurposeList.contains("RESPONSE")) {
ownerContentId = contentToValue.ownerContentId