From 1342b2fdd5c61d91dea576029decccffa0cc8e6a Mon Sep 17 00:00:00 2001 From: Mridul Pathak Date: Thu, 12 Nov 2026 22:05:09 +0530 Subject: [PATCH] Remove the multi-block attribute and the getJs requests The framework no longer extracts the inline scripts of html-template widgets marked multi-block="true" (OFBIZ-13831), so the attribute has no effect and the getJs and js requests of the ecommerce controller have nothing to serve. Remove the attribute from the ecommerce, example and projectmgr screens, remove the two requests, and document it in UPGRADING.md. --- UPGRADING.md | 2 ++ .../webapp/ecommerce/WEB-INF/controller.xml | 13 ------- ecommerce/widget/CartScreens.xml | 2 +- ecommerce/widget/CatalogScreens.xml | 12 +++---- ecommerce/widget/CommonScreens.xml | 8 ++--- ecommerce/widget/CustomerScreens.xml | 4 +-- ecommerce/widget/EmailContactListScreens.xml | 2 +- ecommerce/widget/EmailProductScreens.xml | 2 +- ecommerce/widget/OrderScreens.xml | 34 +++++++++---------- ecommerce/widget/ShoppingListScreens.xml | 4 +-- .../example/FormWidgetExampleScreens.xml | 6 ++-- projectmgr/widget/ProjectScreens.xml | 2 +- projectmgr/widget/TaskScreens.xml | 2 +- projectmgr/widget/TimeSheetScreens.xml | 2 +- 14 files changed, 42 insertions(+), 53 deletions(-) diff --git a/UPGRADING.md b/UPGRADING.md index 6227a17ba..cdc5f21ac 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -89,6 +89,8 @@ upgrade. are removed with the payment gateways ([#295](https://github.com/apache/ofbiz-plugins/pull/295)). * The controller no longer declares the `http` view handler ([#426](https://github.com/apache/ofbiz-plugins/pull/426)). +* The `getJs` and `js` requests are removed with the `multi-block` script extraction + ([OFBIZ-13831](https://issues.apache.org/jira/browse/OFBIZ-13831)). See the framework notes. ### example diff --git a/ecommerce/webapp/ecommerce/WEB-INF/controller.xml b/ecommerce/webapp/ecommerce/WEB-INF/controller.xml index 20c97cec2..9a37c0dab 100644 --- a/ecommerce/webapp/ecommerce/WEB-INF/controller.xml +++ b/ecommerce/webapp/ecommerce/WEB-INF/controller.xml @@ -168,19 +168,6 @@ under the License. - - - - - - - - - - - - - diff --git a/ecommerce/widget/CartScreens.xml b/ecommerce/widget/CartScreens.xml index 6e86d18ee..4014ab311 100644 --- a/ecommerce/widget/CartScreens.xml +++ b/ecommerce/widget/CartScreens.xml @@ -82,7 +82,7 @@ under the License. - + diff --git a/ecommerce/widget/CatalogScreens.xml b/ecommerce/widget/CatalogScreens.xml index 4ddb26f18..ab5009c58 100644 --- a/ecommerce/widget/CatalogScreens.xml +++ b/ecommerce/widget/CatalogScreens.xml @@ -143,7 +143,7 @@ under the License.