You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by wp...@apache.org on 2023/07/27 12:59:54 UTC
[ofbiz-framework] 01/07: Improved: Moves imports under the license header (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository.
wpaetzold pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 0cbdbee7cd9db01f6b37de2576d6661b7e9fb421
Author: Wiebke Pätzold <Wi...@ecomify.de>
AuthorDate: Wed Jul 5 17:46:06 2023 +0200
Improved: Moves imports under the license header (OFBIZ-12813)
---
framework/common/groovyScripts/ChildrenCustomScreenTypes.groovy | 9 +++++----
framework/common/groovyScripts/ListPortalPortlets.groovy | 6 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/framework/common/groovyScripts/ChildrenCustomScreenTypes.groovy b/framework/common/groovyScripts/ChildrenCustomScreenTypes.groovy
index b8d3b58877..5671730553 100644
--- a/framework/common/groovyScripts/ChildrenCustomScreenTypes.groovy
+++ b/framework/common/groovyScripts/ChildrenCustomScreenTypes.groovy
@@ -1,7 +1,3 @@
-import org.apache.ofbiz.entity.GenericValue
-import org.apache.ofbiz.entity.util.EntityTypeUtil
-import org.apache.ofbiz.entity.util.EntityUtil
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +17,11 @@ import org.apache.ofbiz.entity.util.EntityUtil
* under the License.
*/
+import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.entity.util.EntityTypeUtil
+import org.apache.ofbiz.entity.util.EntityUtil
+
+
List customScreenTypeIds = []
if (context.customScreenTypeId) {
GenericValue customScreenType = from('CustomScreenType').where([customScreenTypeId: customScreenTypeId]).cache().queryOne()
diff --git a/framework/common/groovyScripts/ListPortalPortlets.groovy b/framework/common/groovyScripts/ListPortalPortlets.groovy
index 3dba83b185..81b6efbe9f 100644
--- a/framework/common/groovyScripts/ListPortalPortlets.groovy
+++ b/framework/common/groovyScripts/ListPortalPortlets.groovy
@@ -1,6 +1,3 @@
-import org.apache.ofbiz.entity.condition.EntityCondition
-import org.apache.ofbiz.entity.condition.EntityOperator
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,6 +17,9 @@ import org.apache.ofbiz.entity.condition.EntityOperator
* under the License.
*/
+import org.apache.ofbiz.entity.condition.EntityCondition
+import org.apache.ofbiz.entity.condition.EntityOperator
+
ppCond = EntityCondition.makeCondition('portletCategoryId', EntityOperator.EQUALS, parameters.portletCategoryId)
categories = delegator.findList('PortletPortletCategory', ppCond, null, null, null, false)