[ofbiz-framework] branch release17.12 updated: Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudg
This is an automated email from the ASF dual-hosted git repository. adityasharma pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release17.12 by this push: new aec541e Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudget for Employment Applications page of party 2. LookupDataResource for Content page of facility 3. LookupFixedAsset for Inventory Items Details page of facility aec541e is described below commit aec541efe194d8ec6642735c8d024076511c9e06 Author: Aditya Sharma AuthorDate: Sun May 31 09:53:26 2020 +0530 Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudget for Employment Applications page of party 2. LookupDataResource for Content page of facility 3. LookupFixedAsset for Inventory Items Details page of facility Thank you Pallavi Goyal for reporting the issue and Humera Khan for providing the patch --- applications/party/webapp/partymgr/WEB-INF/controller.xml | 2 ++ applications/product/webapp/facility/WEB-INF/controller.xml | 7 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/applications/party/webapp/partymgr/WEB-INF/controller.xml b/applications/party/webapp/partymgr/WEB-INF/controller.xml index 84709f8..45712fb 100644 --- a/applications/party/webapp/partymgr/WEB-INF/controller.xml +++ b/applications/party/webapp/partymgr/WEB-INF/controller.xml @@ -1238,6 +1238,7 @@ under the License. + @@ -1449,6 +1450,7 @@ under the License. + diff --git a/applications/product/webapp/facility/WEB-INF/controller.xml b/applications/product/webapp/facility/WEB-INF/controller.xml index 9938fb6..9c1362e 100644 --- a/applications/product/webapp/facility/WEB-INF/controller.xml +++ b/applications/product/webapp/facility/WEB-INF/controller.xml @@ -1266,7 +1266,7 @@ under the License. - + @@ -1350,6 +1350,8 @@ under the License. + + @@ -1454,7 +1456,8 @@ under the License. - + +
[ofbiz-framework] branch release18.12 updated: Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudg
This is an automated email from the ASF dual-hosted git repository. adityasharma pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release18.12 by this push: new 9553198 Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudget for Employment Applications page of party 2. LookupDataResource for Content page of facility 3. LookupFixedAsset for Inventory Items Details page of facility 9553198 is described below commit 955319862ed30411151b159638b7ed06b98f10ff Author: Aditya Sharma AuthorDate: Sun May 31 09:53:26 2020 +0530 Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudget for Employment Applications page of party 2. LookupDataResource for Content page of facility 3. LookupFixedAsset for Inventory Items Details page of facility Thank you Pallavi Goyal for reporting the issue and Humera Khan for providing the patch --- applications/party/webapp/partymgr/WEB-INF/controller.xml | 2 ++ applications/product/webapp/facility/WEB-INF/controller.xml | 7 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/applications/party/webapp/partymgr/WEB-INF/controller.xml b/applications/party/webapp/partymgr/WEB-INF/controller.xml index a0dbf48..5721bf6 100644 --- a/applications/party/webapp/partymgr/WEB-INF/controller.xml +++ b/applications/party/webapp/partymgr/WEB-INF/controller.xml @@ -1266,6 +1266,7 @@ under the License. + @@ -1478,6 +1479,7 @@ under the License. + diff --git a/applications/product/webapp/facility/WEB-INF/controller.xml b/applications/product/webapp/facility/WEB-INF/controller.xml index 0ddf8e0..d417cd9 100644 --- a/applications/product/webapp/facility/WEB-INF/controller.xml +++ b/applications/product/webapp/facility/WEB-INF/controller.xml @@ -1274,7 +1274,7 @@ under the License. - + @@ -1359,6 +1359,8 @@ under the License. + + @@ -1464,7 +1466,8 @@ under the License. - + +
[ofbiz-framework] branch trunk updated: Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudget for
This is an automated email from the ASF dual-hosted git repository. adityasharma 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 3bc127d Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudget for Employment Applications page of party 2. LookupDataResource for Content page of facility 3. LookupFixedAsset for Inventory Items Details page of facility 3bc127d is described below commit 3bc127dfb03935b3cde43b105d48a324d2c45a82 Author: Aditya Sharma AuthorDate: Sun May 31 09:53:26 2020 +0530 Fixed: RequestHandlerException due missing controller entries (OFBIZ-9478) Fixed missing Lookup controller entries for the following pages: 1. LookupBudget for Employment Applications page of party 2. LookupDataResource for Content page of facility 3. LookupFixedAsset for Inventory Items Details page of facility Thank you Pallavi Goyal for reporting the issue and Humera Khan for providing the patch --- applications/party/webapp/partymgr/WEB-INF/controller.xml | 2 ++ applications/product/webapp/facility/WEB-INF/controller.xml | 7 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/applications/party/webapp/partymgr/WEB-INF/controller.xml b/applications/party/webapp/partymgr/WEB-INF/controller.xml index b88c306..4bb4407 100644 --- a/applications/party/webapp/partymgr/WEB-INF/controller.xml +++ b/applications/party/webapp/partymgr/WEB-INF/controller.xml @@ -1266,6 +1266,7 @@ under the License. + @@ -1478,6 +1479,7 @@ under the License. + diff --git a/applications/product/webapp/facility/WEB-INF/controller.xml b/applications/product/webapp/facility/WEB-INF/controller.xml index 35cb285..a196d4e 100644 --- a/applications/product/webapp/facility/WEB-INF/controller.xml +++ b/applications/product/webapp/facility/WEB-INF/controller.xml @@ -1274,7 +1274,7 @@ under the License. - + @@ -1359,6 +1359,8 @@ under the License. + + @@ -1464,7 +1466,8 @@ under the License. - + +
buildbot success in on ofbizBranch18FrameworkPlugins
The Buildbot has detected a restored build on builder ofbizBranch18FrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizBranch18FrameworkPlugins/builds/361 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf947_ubuntu Build Reason: downstream Build Source Stamp: [branch release18.12] 73bfbc643b5e2f35f5c8e9dae777cd760405fdeb Blamelist: Pawan Verma Build succeeded! Sincerely, -The Buildbot
buildbot success in on ofbizBranch17FrameworkPlugins
The Buildbot has detected a restored build on builder ofbizBranch17FrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/520 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf947_ubuntu Build Reason: downstream Build Source Stamp: [branch release17.12] 38a4202d91b0865b5755fdd01a5cf45c52d85384 Blamelist: Pawan Verma Build succeeded! Sincerely, -The Buildbot
[ofbiz-framework] branch release17.12 updated: Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408)
This is an automated email from the ASF dual-hosted git repository. pawan pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release17.12 by this push: new 38a4202 Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408) 38a4202 is described below commit 38a4202d91b0865b5755fdd01a5cf45c52d85384 Author: Pawan Verma AuthorDate: Sat May 30 23:07:03 2020 +0530 Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408) --- applications/product/widget/catalog/ProductForms.xml | 2 +- plugins | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml index b203551..c8789a7 100644 --- a/applications/product/widget/catalog/ProductForms.xml +++ b/applications/product/widget/catalog/ProductForms.xml @@ -2333,7 +2333,7 @@ under the License. - + diff --git a/plugins b/plugins new file mode 16 index 000..2c65f7d --- /dev/null +++ b/plugins @@ -0,0 +1 @@ +Subproject commit 2c65f7d17bcdbccd7d166701365c56bca40d2f2d
[ofbiz-framework] branch release18.12 updated: Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408)
This is an automated email from the ASF dual-hosted git repository. pawan pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release18.12 by this push: new 73bfbc6 Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408) 73bfbc6 is described below commit 73bfbc643b5e2f35f5c8e9dae777cd760405fdeb Author: Pawan Verma AuthorDate: Sat May 30 23:07:03 2020 +0530 Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408) --- applications/product/widget/catalog/ProductForms.xml | 2 +- plugins | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml index 5272250..7ef2551 100644 --- a/applications/product/widget/catalog/ProductForms.xml +++ b/applications/product/widget/catalog/ProductForms.xml @@ -2333,7 +2333,7 @@ under the License. - + diff --git a/plugins b/plugins new file mode 16 index 000..2c65f7d --- /dev/null +++ b/plugins @@ -0,0 +1 @@ +Subproject commit 2c65f7d17bcdbccd7d166701365c56bca40d2f2d
[ofbiz-framework] branch trunk updated: Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408)
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-framework.git The following commit(s) were added to refs/heads/trunk by this push: new bda6192 Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408) bda6192 is described below commit bda6192b6b3bbe6026f3558edb42b736ff8baa1c Author: Pawan Verma AuthorDate: Sat May 30 23:07:03 2020 +0530 Fixed: Corrected package path for UtilDateTime.(OFBIZ-6408) --- applications/product/widget/catalog/ProductForms.xml | 2 +- plugins | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml index 5979bf7..69c989c 100644 --- a/applications/product/widget/catalog/ProductForms.xml +++ b/applications/product/widget/catalog/ProductForms.xml @@ -2333,7 +2333,7 @@ under the License. - + diff --git a/plugins b/plugins new file mode 16 index 000..2c65f7d --- /dev/null +++ b/plugins @@ -0,0 +1 @@ +Subproject commit 2c65f7d17bcdbccd7d166701365c56bca40d2f2d
buildbot failure in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a new failure on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1430 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf947_ubuntu Build Reason: forced: by IRC user (privmsg): forces manual build to clear if a possible syntax issue Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed testIntegration Sincerely, -The Buildbot
buildbot success in on ofbizTrunkFrameworkRat
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkRat while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkRat/builds/1108 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: forced: by IRC user (privmsg): forces manual build after global certificate issue Build Source Stamp: HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot exception in on ofbizBranch17FrameworkPlugins
The Buildbot has detected a build exception on builder ofbizBranch17FrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/519 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: downstream Build Source Stamp: [branch release17.12] 482df0ba5e982287c178292fdaa5af8f882a045b Blamelist: Pawan Verma BUILD FAILED: exception upload_3 Sincerely, -The Buildbot
buildbot success in on ofbizBranch18FrameworkPlugins
The Buildbot has detected a restored build on builder ofbizBranch18FrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch18FrameworkPlugins/builds/359 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: forced: by IRC user (privmsg): forces manual build after supposed BuildBot test error on Solr Build Source Stamp: HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot exception in on ofbizBranch18FrameworkPlugins
The Buildbot has detected a build exception on builder ofbizBranch18FrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizBranch18FrameworkPlugins/builds/360 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: downstream Build Source Stamp: [branch release18.12] b35dd06905aebf1eb5aa08213f23112d5227bdf9 Blamelist: Pawan Verma BUILD FAILED: exception upload_3 Sincerely, -The Buildbot
buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1426 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: forced: by IRC user (privmsg): forces manual build to test steps names Build Source Stamp: HEAD Blamelist: BUILD FAILED: exception upload_4 Sincerely, -The Buildbot
buildbot failure in on ofbizTrunkFrameworkRat
The Buildbot has detected a new failure on builder ofbizTrunkFrameworkRat while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkRat/builds/1104 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] c8a7c7dd2344b2377f47331e8c7629c454144c5b Blamelist: Priya Sharma BUILD FAILED: failed Sincerely, -The Buildbot
[ofbiz-framework] branch release17.12 updated: Fixed: Adding a group order generates an error(OFBIZ-6408)
This is an automated email from the ASF dual-hosted git repository. pawan pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release17.12 by this push: new 482df0b Fixed: Adding a group order generates an error(OFBIZ-6408) 482df0b is described below commit 482df0ba5e982287c178292fdaa5af8f882a045b Author: Pawan Verma AuthorDate: Sat May 30 15:36:52 2020 +0530 Fixed: Adding a group order generates an error(OFBIZ-6408) The error is caused by an invalid expression, the two boolean evaluations should reside in the same groovy scriptlet. Thanks, Pierre for report, Scott for the solution and Adrian, Jacques, Rahul for the review. --- applications/product/widget/catalog/ProductForms.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml index e31a1da..b203551 100644 --- a/applications/product/widget/catalog/ProductForms.xml +++ b/applications/product/widget/catalog/ProductForms.xml @@ -2333,7 +2333,7 @@ under the License. - +
[ofbiz-framework] branch trunk updated: Fixed: Adding a group order generates an error(OFBIZ-6408)
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-framework.git The following commit(s) were added to refs/heads/trunk by this push: new f0e60ba Fixed: Adding a group order generates an error(OFBIZ-6408) f0e60ba is described below commit f0e60ba3dc6d4a3a9b09f3d87a42c9e8a53d4e25 Author: Pawan Verma AuthorDate: Sat May 30 15:36:52 2020 +0530 Fixed: Adding a group order generates an error(OFBIZ-6408) The error is caused by an invalid expression, the two boolean evaluations should reside in the same groovy scriptlet. Thanks, Pierre for report, Scott for the solution and Adrian, Jacques, Rahul for the review. --- applications/product/widget/catalog/ProductForms.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml index d3fd3c8..5979bf7 100644 --- a/applications/product/widget/catalog/ProductForms.xml +++ b/applications/product/widget/catalog/ProductForms.xml @@ -2333,7 +2333,7 @@ under the License. - +
[ofbiz-framework] branch release18.12 updated: Fixed: Adding a group order generates an error(OFBIZ-6408)
This is an automated email from the ASF dual-hosted git repository. pawan pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release18.12 by this push: new b35dd06 Fixed: Adding a group order generates an error(OFBIZ-6408) b35dd06 is described below commit b35dd06905aebf1eb5aa08213f23112d5227bdf9 Author: Pawan Verma AuthorDate: Sat May 30 15:36:52 2020 +0530 Fixed: Adding a group order generates an error(OFBIZ-6408) The error is caused by an invalid expression, the two boolean evaluations should reside in the same groovy scriptlet. Thanks, Pierre for report, Scott for the solution and Adrian, Jacques, Rahul for the review. --- applications/product/widget/catalog/ProductForms.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml index 208ee72..5272250 100644 --- a/applications/product/widget/catalog/ProductForms.xml +++ b/applications/product/widget/catalog/ProductForms.xml @@ -2333,7 +2333,7 @@ under the License. - +
[ofbiz-framework] branch trunk updated: Fixed: Create Payment service throws an exception when receiving payment on order (OFBIZ-11754) (#166)
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 c8a7c7d Fixed: Create Payment service throws an exception when
receiving payment on order (OFBIZ-11754) (#166)
c8a7c7d is described below
commit c8a7c7dd2344b2377f47331e8c7629c454144c5b
Author: Priya Sharma
AuthorDate: Sat May 30 15:23:53 2020 +0530
Fixed: Create Payment service throws an exception when receiving payment on
order (OFBIZ-11754) (#166)
* [Fixed] Create Payment service throws exception when receiving payment on
order
- Since the MODULE variable could not be found, the service was throwing
error
- Instead used the groovy method directly to print the log instead, which
has access to the module variable implicitly.
- Removed the unused import as Debug class is not longer needed here.
(OFBIZ-11754)
* [Improved] The content groovy services to avoid the error in case we try
to log a detail, since the module variable is not found. (OFBIZ-11754)
* Update ContentServices.groovy
* [Improved] Added error logs instead of info logs for service excpetions
logging. (OFBIZ-11754)
Co-authored-by: Priya Sharma
Co-authored-by: Suraj Khurana
<64310724+surajkhur...@users.noreply.github.com>
---
.../groovyScripts/payment/PaymentServices.groovy | 8 +++-
.../groovyScripts/content/ContentServices.groovy | 24 ++
2 files changed, 14 insertions(+), 18 deletions(-)
diff --git
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index 4032017..3317ccd 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.ofbiz.base.util.Debug
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.base.util.UtilFormatOut
import org.apache.ofbiz.base.util.UtilProperties
@@ -27,7 +26,6 @@ import org.apache.ofbiz.service.ModelService
import org.apache.ofbiz.service.ServiceUtil
import java.sql.Timestamp
-MODULE = "PaymentServices.groovy"
def createPayment() {
if (!security.hasEntityPermission("ACCOUNTING", "_CREATE",
parameters.userLogin) && (!security.hasEntityPermission("PAY_INFO", "_CREATE",
parameters.userLogin) && userLogin.partyId != parameters.partyIdFrom &&
userLogin.partyId != parameters.partyIdTo)) {
return error(UtilProperties.getResourceBundleMap("AccountingUiLabels",
locale)?.AccountingCreatePaymentPermissionError)
@@ -41,7 +39,7 @@ def createPayment() {
if (parameters.paymentMethodId) {
GenericValue paymentMethod =
from("PaymentMethod").where("paymentMethodId",
parameters.paymentMethodId).queryOne()
if (parameters.paymentMethodTypeId !=
paymentMethod.paymentMethodTypeId) {
-Debug.logInfo("Replacing passed payment method type [" +
parameters.paymentMethodTypeId + "] with payment method type [" +
paymentMethod.paymentMethodTypeId + "] for payment method [" +
parameters.paymentMethodId +"]", MODULE)
+logInfo("Replacing passed payment method type [" +
parameters.paymentMethodTypeId + "] with payment method type [" +
paymentMethod.paymentMethodTypeId + "] for payment method [" +
parameters.paymentMethodId +"]")
parameters.paymentMethodTypeId = paymentMethod.paymentMethodTypeId
}
}
@@ -96,8 +94,8 @@ def updatePayment() {
if (payment.paymentMethodId) {
paymentMethod = from("PaymentMethod").where("paymentMethodId",
payment.paymentMethodId).queryOne()
if (payment.paymentMethodTypeId != paymentMethod.paymentMethodTypeId) {
-Debug.logInfo("Replacing passed payment method type [" +
parameters.paymentMethodTypeId + "] with payment method type [" +
-paymentMethod.paymentMethodTypeId + "] for payment method [" +
parameters.paymentMethodId +"]", MODULE)
+logInfo("Replacing passed payment method type [" +
parameters.paymentMethodTypeId + "] with payment method type [" +
+paymentMethod.paymentMethodTypeId + "] for payment method [" +
parameters.paymentMethodId +"]")
}
payment.paymentMethodTypeId = paymentMethod.paymentMethodTypeId
}
diff --git a/applications/content/groovyScripts/content/ContentServices.groovy
b/applications/content/groovyScripts/content/ContentServices.groovy
index c9680dd..efb8bd0 100644
--- a/applications/content/groovyScripts/content/ContentServices.groovy
+++ b/applications/content/groovyScripts/content/ContentServices.groovy
@@ -28,10 +28,8 @@ import org.apache.ofbiz.service.GenericServiceException;
import
buildbot failure in on ofbizBranch18FrameworkPlugins
The Buildbot has detected a new failure on builder ofbizBranch18FrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch18FrameworkPlugins/builds/358 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: forced: by IRC user (privmsg): forces manual build to test dirs creation Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed shell_6 Sincerely, -The Buildbot
buildbot failure in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a new failure on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1423 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] d1a22a6ba8456ea72167af922155882ffdecc183 Blamelist: James Yong BUILD FAILED: failed shell_7 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: Headerize external script in multi-block html template (OFBIZ-11741)
This is an automated email from the ASF dual-hosted git repository.
jamesyong 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 d1a22a6 Improved: Headerize external script in multi-block html
template (OFBIZ-11741)
d1a22a6 is described below
commit d1a22a6ba8456ea72167af922155882ffdecc183
Author: James Yong
AuthorDate: Sat May 30 14:32:38 2020 +0800
Improved: Headerize external script in multi-block html template
(OFBIZ-11741)
Cleanup script cache when session ended
---
.../org/apache/ofbiz/webapp/control/ControlEventListener.java | 6 --
.../apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java | 11 +++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
index 49f4f92..a188a14 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
@@ -26,7 +26,6 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-import org.apache.ofbiz.security.CsrfUtil;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilDateTime;
import org.apache.ofbiz.base.util.UtilGenerics;
@@ -38,6 +37,8 @@ import org.apache.ofbiz.entity.GenericValue;
import org.apache.ofbiz.entity.serialize.XmlSerializer;
import org.apache.ofbiz.entity.transaction.TransactionUtil;
import org.apache.ofbiz.entity.util.EntityQuery;
+import org.apache.ofbiz.security.CsrfUtil;
+import org.apache.ofbiz.widget.model.MultiBlockHtmlTemplateUtil;
/**
* HttpSessionListener that gathers and tracks various information and
statistics
@@ -73,6 +74,7 @@ public class ControlEventListener implements
HttpSessionListener {
HttpSession session = event.getSession();
CsrfUtil.cleanupTokenMap(session);
+MultiBlockHtmlTemplateUtil.cleanupScriptCache(session);
// Finalize the Visit
boolean beganTransaction = false;
@@ -141,7 +143,7 @@ public class ControlEventListener implements
HttpSessionListener {
Debug.logInfo("",
MODULE);
Debug.logInfo("Total Sessions : " +
ControlEventListener.getTotalActiveSessions(), MODULE);
Debug.logInfo("Total Active : " +
ControlEventListener.getTotalActiveSessions(), MODULE);
-Debug.logInfo("Total Passive : " +
ControlEventListener.getTotalPassiveSessions(), MODULE);
+Debug.logInfo("Total Passive : " +
ControlEventListener.getTotalPassiveSessions(), MODULE);
Debug.logInfo("** note : this session has been counted as
destroyed.", MODULE);
Debug.logInfo("",
MODULE);
if (visit != null) {
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
index ee29af5..7404963 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
@@ -36,8 +36,7 @@ public final class MultiBlockHtmlTemplateUtil {
public static final String MULTI_BLOCK_WRITER = "multiBlockWriter";
private static final String HTML_LINKS_FOR_HEAD = "htmlLinksForHead";
private static final String SCRIPT_LINKS_FOR_FOOT = "ScriptLinksForFoot";
-private static int maxNumOfScriptInCache = 10;
-private static int cacheSize = 100;
+private static int maxScriptCacheSizePerSession = 10;
// store inline script from freemarker template by user session
private static LinkedHashMap> scriptCache =
new LinkedHashMap>() {
@@ -180,7 +179,7 @@ public final class MultiBlockHtmlTemplateUtil {
}
/**
- * get the script links for page footer. Also @see {@link
ScriptTagsFooterTransform}
+ * get the script links for page footer. Also @see {@link
org.apache.ofbiz.webapp.ftl.ScriptTagsFooterTransform}
* @param request
* @return
*/
@@ -204,7 +203,7 @@ public final class MultiBlockHtmlTemplateUtil {
scriptMap = new LinkedHashMap() {
private static final long serialVersionUID = 1L;
protected boolean removeEldestEntry(Map.Entry
eldest) {
-return size() > maxNumOfScriptInCache;
+return size() > maxScriptCacheSizePerSession;
}
