This is an automated email from the ASF dual-hosted git repository.
mleila pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release24.09 by this push:
new efb1c866f0 Fixed: Add a default value for ShortcutApp screens menus
(OFBIZ-12928)
efb1c866f0 is described below
commit efb1c866f061f7fff3421ea688c2b86bb65f1c23
Author: MLeila <[email protected]>
AuthorDate: Fri Oct 11 12:43:30 2024 +0200
Fixed: Add a default value for ShortcutApp screens menus (OFBIZ-12928)
Add a default value to avoid breaking inter-app reference of shortcut
app screen (see OFBIZ-10601)
---
applications/accounting/widget/CommonScreens.xml | 3 ++-
applications/content/widget/CommonScreens.xml | 3 ++-
applications/humanres/widget/CommonScreens.xml | 3 ++-
applications/manufacturing/widget/manufacturing/CommonScreens.xml | 3 ++-
applications/marketing/widget/CommonScreens.xml | 3 ++-
applications/marketing/widget/sfa/CommonScreens.xml | 3 ++-
applications/order/widget/ordermgr/CommonScreens.xml | 3 ++-
applications/party/widget/partymgr/CommonScreens.xml | 3 ++-
applications/product/widget/catalog/CatalogScreens.xml | 3 ++-
applications/product/widget/facility/FacilityScreens.xml | 5 ++++-
applications/workeffort/widget/CommonScreens.xml | 3 ++-
11 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/applications/accounting/widget/CommonScreens.xml
b/applications/accounting/widget/CommonScreens.xml
index ef97cdd420..fdb60af711 100644
--- a/applications/accounting/widget/CommonScreens.xml
+++ b/applications/accounting/widget/CommonScreens.xml
@@ -51,11 +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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="AccountingShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="AccountingShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/content/widget/CommonScreens.xml
b/applications/content/widget/CommonScreens.xml
index 54a1f4ea66..1ee89d780c 100644
--- a/applications/content/widget/CommonScreens.xml
+++ b/applications/content/widget/CommonScreens.xml
@@ -49,11 +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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="ContentShortcutAppBar"
location="component://content/widget/content/ContentMenus.xml"/>
+ <include-menu name="ContentShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/humanres/widget/CommonScreens.xml
b/applications/humanres/widget/CommonScreens.xml
index 9ce37501d4..96b4a0ac2d 100644
--- a/applications/humanres/widget/CommonScreens.xml
+++ b/applications/humanres/widget/CommonScreens.xml
@@ -78,11 +78,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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="HumanResShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="HumanResShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/manufacturing/widget/manufacturing/CommonScreens.xml
b/applications/manufacturing/widget/manufacturing/CommonScreens.xml
index e43f405660..d00165d1b5 100644
--- a/applications/manufacturing/widget/manufacturing/CommonScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/CommonScreens.xml
@@ -81,11 +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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="ManufacturingShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="ManufacturingShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/marketing/widget/CommonScreens.xml
b/applications/marketing/widget/CommonScreens.xml
index bc24531948..6faf75d0ec 100644
--- a/applications/marketing/widget/CommonScreens.xml
+++ b/applications/marketing/widget/CommonScreens.xml
@@ -122,11 +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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="MarketingShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="MarketingShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/marketing/widget/sfa/CommonScreens.xml
b/applications/marketing/widget/sfa/CommonScreens.xml
index adfbae8467..81d4be7827 100644
--- a/applications/marketing/widget/sfa/CommonScreens.xml
+++ b/applications/marketing/widget/sfa/CommonScreens.xml
@@ -81,11 +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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="SfaShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="SfaShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/order/widget/ordermgr/CommonScreens.xml
b/applications/order/widget/ordermgr/CommonScreens.xml
index bddb6def82..720343487f 100644
--- a/applications/order/widget/ordermgr/CommonScreens.xml
+++ b/applications/order/widget/ordermgr/CommonScreens.xml
@@ -136,11 +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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="OrderShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="OrderShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/party/widget/partymgr/CommonScreens.xml
b/applications/party/widget/partymgr/CommonScreens.xml
index b292e4ece0..7de326d857 100644
--- a/applications/party/widget/partymgr/CommonScreens.xml
+++ b/applications/party/widget/partymgr/CommonScreens.xml
@@ -152,11 +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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="PartyShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="PartyShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/product/widget/catalog/CatalogScreens.xml
b/applications/product/widget/catalog/CatalogScreens.xml
index a4e34d85a2..90b798ec6e 100644
--- a/applications/product/widget/catalog/CatalogScreens.xml
+++ b/applications/product/widget/catalog/CatalogScreens.xml
@@ -208,11 +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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="CatalogShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="CatalogShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/product/widget/facility/FacilityScreens.xml
b/applications/product/widget/facility/FacilityScreens.xml
index 0f4306524c..ffaef274c9 100644
--- a/applications/product/widget/facility/FacilityScreens.xml
+++ b/applications/product/widget/facility/FacilityScreens.xml
@@ -1579,10 +1579,13 @@ under the License.
</screen>
<screen name="ShortcutApp">
<section>
+ <actions>
+ <set field="mainMenuLocation"
from-field="parameters.mainMenuLocation"
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="${parameters.mainMenuLocation}"/>
+ <include-menu name="FacilityShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/workeffort/widget/CommonScreens.xml
b/applications/workeffort/widget/CommonScreens.xml
index 13d1d58bce..fcae03b5f8 100644
--- a/applications/workeffort/widget/CommonScreens.xml
+++ b/applications/workeffort/widget/CommonScreens.xml
@@ -238,11 +238,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"/>
</actions>
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="WorkEffortShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="WorkEffortShortcutAppBar"
location="${mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
