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 a57b6b3d57 Fixed: Isolate shortcut menu variable in context (#2095)
a57b6b3d57 is described below
commit a57b6b3d5738d911cf5d58e6299984e72f18342c
Author: Nicolas Malin <[email protected]>
AuthorDate: Mon Sep 28 09:31:05 2026 +0200
Fixed: Isolate shortcut menu variable in context (#2095)
After commits introduce mainMenuLocation on web.xml (like 4412dc1a) a
first fix tried to be set to escape collision between menu present on
shortcut when you load it all (to create a global shortcut screen)
Unfortunately the collision is always present, so to fix that we
implement a dedication variable `shortcutMenuLocation` to collect
potential custom shortcut menu location and isolate each menu location
name.
After that you can create a global shortcut screen that call each webapp
shortcut without collision on menu location
---
applications/accounting/widget/CommonScreens.xml | 4 ++--
applications/content/widget/CommonScreens.xml | 4 ++--
applications/humanres/widget/CommonScreens.xml | 4 ++--
applications/manufacturing/widget/manufacturing/CommonScreens.xml | 4 ++--
applications/marketing/widget/CommonScreens.xml | 4 ++--
applications/marketing/widget/sfa/CommonScreens.xml | 4 ++--
applications/order/widget/ordermgr/CommonScreens.xml | 4 ++--
applications/party/widget/partymgr/CommonScreens.xml | 4 ++--
applications/product/widget/catalog/CatalogScreens.xml | 4 ++--
applications/product/widget/facility/FacilityScreens.xml | 4 ++--
applications/workeffort/widget/CommonScreens.xml | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/applications/accounting/widget/CommonScreens.xml
b/applications/accounting/widget/CommonScreens.xml
index 38fdc29607..f847e8ca85 100644
--- a/applications/accounting/widget/CommonScreens.xml
+++ b/applications/accounting/widget/CommonScreens.xml
@@ -51,12 +51,12 @@ under the License.
<actions>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://accounting/widget/AccountingMenus.xml"/>
+ <set field="accountingMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://accounting/widget/AccountingMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="AccountingShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="AccountingShortcutAppBar"
location="${accountingMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/content/widget/CommonScreens.xml
b/applications/content/widget/CommonScreens.xml
index 1ee89d780c..f5947c5303 100644
--- a/applications/content/widget/CommonScreens.xml
+++ b/applications/content/widget/CommonScreens.xml
@@ -49,12 +49,12 @@ under the License.
<actions>
<property-map resource="ContentUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://content/widget/content/ContentMenus.xml"/>
+ <set field="contentMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://content/widget/content/ContentMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="ContentShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="ContentShortcutAppBar"
location="${contentMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/humanres/widget/CommonScreens.xml
b/applications/humanres/widget/CommonScreens.xml
index ac114b03cc..e2d6a7dc3c 100644
--- a/applications/humanres/widget/CommonScreens.xml
+++ b/applications/humanres/widget/CommonScreens.xml
@@ -77,12 +77,12 @@ under the License.
<actions>
<property-map resource="HumanResUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://humanres/widget/HumanresMenus.xml"/>
+ <set field="humanresMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://humanres/widget/HumanresMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="HumanResShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="HumanResShortcutAppBar"
location="${humanresMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/manufacturing/widget/manufacturing/CommonScreens.xml
b/applications/manufacturing/widget/manufacturing/CommonScreens.xml
index d00165d1b5..e428d21a59 100644
--- a/applications/manufacturing/widget/manufacturing/CommonScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/CommonScreens.xml
@@ -81,12 +81,12 @@ under the License.
<property-map resource="ManufacturingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <set field="manufacturingMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="ManufacturingShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="ManufacturingShortcutAppBar"
location="${manufacturingMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/marketing/widget/CommonScreens.xml
b/applications/marketing/widget/CommonScreens.xml
index 6faf75d0ec..6922b66577 100644
--- a/applications/marketing/widget/CommonScreens.xml
+++ b/applications/marketing/widget/CommonScreens.xml
@@ -122,12 +122,12 @@ under the License.
<actions>
<property-map resource="MarketingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://marketing/widget/MarketingMenus.xml"/>
+ <set field="marketingMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://marketing/widget/MarketingMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="MarketingShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="MarketingShortcutAppBar"
location="${marketingMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/marketing/widget/sfa/CommonScreens.xml
b/applications/marketing/widget/sfa/CommonScreens.xml
index 81d4be7827..c7f15afacc 100644
--- a/applications/marketing/widget/sfa/CommonScreens.xml
+++ b/applications/marketing/widget/sfa/CommonScreens.xml
@@ -81,12 +81,12 @@ under the License.
<actions>
<property-map resource="MarketingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <set field="sfaMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://marketing/widget/sfa/SfaMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="SfaShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="SfaShortcutAppBar"
location="${sfaMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/order/widget/ordermgr/CommonScreens.xml
b/applications/order/widget/ordermgr/CommonScreens.xml
index 720343487f..6bc600bf18 100644
--- a/applications/order/widget/ordermgr/CommonScreens.xml
+++ b/applications/order/widget/ordermgr/CommonScreens.xml
@@ -136,12 +136,12 @@ under the License.
<property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <set field="orderMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://order/widget/ordermgr/OrderMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="OrderShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="OrderShortcutAppBar"
location="${orderMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/party/widget/partymgr/CommonScreens.xml
b/applications/party/widget/partymgr/CommonScreens.xml
index 7de326d857..891cab45d0 100644
--- a/applications/party/widget/partymgr/CommonScreens.xml
+++ b/applications/party/widget/partymgr/CommonScreens.xml
@@ -152,12 +152,12 @@ under the License.
<section>
<actions>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://party/widget/partymgr/PartyMenus.xml"/>
+ <set field="partyMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://party/widget/partymgr/PartyMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="PartyShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="PartyShortcutAppBar"
location="${partyMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/product/widget/catalog/CatalogScreens.xml
b/applications/product/widget/catalog/CatalogScreens.xml
index 90b798ec6e..f233723565 100644
--- a/applications/product/widget/catalog/CatalogScreens.xml
+++ b/applications/product/widget/catalog/CatalogScreens.xml
@@ -208,12 +208,12 @@ under the License.
<section>
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://product/widget/catalog/CatalogMenus.xml"/>
+ <set field="catalogMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://product/widget/catalog/CatalogMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="CatalogShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="CatalogShortcutAppBar"
location="${catalogMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/product/widget/facility/FacilityScreens.xml
b/applications/product/widget/facility/FacilityScreens.xml
index cd1e8efe16..535099da88 100644
--- a/applications/product/widget/facility/FacilityScreens.xml
+++ b/applications/product/widget/facility/FacilityScreens.xml
@@ -1479,12 +1479,12 @@ under the License.
<screen name="ShortcutApp">
<section>
<actions>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://product/widget/facility/FacilityMenus.xml"/>
+ <set field="facilityMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://product/widget/facility/FacilityMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="FacilityShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="FacilityShortcutAppBar"
location="${facilityMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/workeffort/widget/CommonScreens.xml
b/applications/workeffort/widget/CommonScreens.xml
index 7e4b0d2d48..e5fdefa6d8 100644
--- a/applications/workeffort/widget/CommonScreens.xml
+++ b/applications/workeffort/widget/CommonScreens.xml
@@ -256,12 +256,12 @@ under the License.
<actions>
<property-map resource="WorkEffortUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
default-value="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <set field="workeffortMenuLocation"
from-field="parameters.shortcutMenuLocation"
default-value="component://workeffort/widget/WorkEffortMenus.xml"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="WorkEffortShortcutAppBar"
location="${mainMenuLocation}"/>
+ <include-menu name="WorkEffortShortcutAppBar"
location="${workeffortMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
