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
The following commit(s) were added to refs/heads/trunk by this push:
new 3fb6b40 Fixed: Clean groovy file FindLookUp No functional change : *
remove case syntax * use groovy syntax (excepted on executeResult.listIt,
EntityListIterator not support the groovy syntax *if (!listIt)*) * use Elvis
operator for default values * add typage to help ide and compilation
3fb6b40 is described below
commit 3fb6b40aa396561db9a87c9f35a28db3b038a70a
Author: Nicolas Malin <nicolas.ma...@nereide.fr>
AuthorDate: Tue Aug 17 16:24:54 2021 +0200
Fixed: Clean groovy file FindLookUp
No functional change :
* remove case syntax
* use groovy syntax (excepted on executeResult.listIt, EntityListIterator
not support the groovy syntax *if (!listIt)*)
* use Elvis operator for default values
* add typage to help ide and compilation
---
.../party/groovyScripts/party/FindLookUp.groovy | 50 +++++++++-------------
1 file changed, 21 insertions(+), 29 deletions(-)
diff --git a/applications/party/groovyScripts/party/FindLookUp.groovy
b/applications/party/groovyScripts/party/FindLookUp.groovy
index c319692..a325f4e 100644
--- a/applications/party/groovyScripts/party/FindLookUp.groovy
+++ b/applications/party/groovyScripts/party/FindLookUp.groovy
@@ -17,46 +17,38 @@
* under the License.
*/
-
-
-
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.entity.util.EntityUtilProperties
-if (context.noConditionFind == null) {
- context.noConditionFind = parameters.noConditionFind
-}
-if (context.noConditionFind == null) {
- context.noConditionFind = EntityUtilProperties.getPropertyValue("widget",
"widget.defaultNoConditionFind", delegator)
-}
-if (context.filterByDate == null) {
- context.filterByDate = parameters.filterByDate
+if (! context.noConditionFind) {
+ context.noConditionFind = parameters.noConditionFind ?:
+ EntityUtilProperties.getPropertyValue("widget",
"widget.defaultNoConditionFind", delegator)
}
-prepareResult = runService('prepareFind', [entityName : context.entityName,
- orderBy : context.orderBy,
- inputFields : parameters,
- filterByDate : context.filterByDate,
- filterByDateValue :
context.filterByDateValue,
- userLogin : context.userLogin])
+Map prepareResult = runService('prepareFind', [entityName: context.entityName,
+ orderBy: context.orderBy,
+ inputFields: parameters,
+ filterByDate:
context.filterByDate ?: parameters.filterByDate,
+ filterByDateValue:
context.filterByDateValue,
+ userLogin: context.userLogin])
-exprList = [EntityCondition.makeCondition("statusId", null),
- EntityCondition.makeCondition("statusId",
EntityOperator.NOT_EQUAL, "PARTY_DISABLED")]
-statusPartyDisable = EntityCondition.makeCondition(exprList, EntityOperator.OR)
-entityConditionList = null
-if (prepareResult.entityConditionList != null) {
- ConditionList = [prepareResult.entityConditionList, statusPartyDisable]
- entityConditionList = EntityCondition.makeCondition(ConditionList)
+EntityCondition statusPartyDisable = EntityCondition.makeCondition(
+ [EntityCondition.makeCondition("statusId", null),
+ EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL,
"PARTY_DISABLED")],
+ EntityOperator.OR)
+EntityCondition entityConditionList = null
+if (prepareResult.entityConditionList) {
+ entityConditionList =
EntityCondition.makeCondition([prepareResult.entityConditionList,
statusPartyDisable])
} else if ("Y" == context.noConditionFind) {
entityConditionList = statusPartyDisable
}
-executeResult = runService('executeFind', [entityName : context.entityName,
- orderByList :
prepareResult.orderByList,
- entityConditionList :
entityConditionList,
- noConditionFind :
context.noConditionFind])
+Map executeResult = runService('executeFind', [entityName: context.entityName,
+ orderByList:
prepareResult.orderByList,
+ entityConditionList:
entityConditionList,
+ noConditionFind:
context.noConditionFind])
if (executeResult.listIt == null) {
- logWarning("No list found for query string + [" +
prepareResult.queryString + "]")
+ logWarning("No list found for query string [${prepareResult.queryString}]")
}
context.listIt = executeResult.listIt
context.queryString = prepareResult.queryString
