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 cf0f874bda Improved: ORDER - Move from hard-code menu location to
parameterized (OFBIZ-12944) (#729)
cf0f874bda is described below
commit cf0f874bdad735792280909b6c82ed46a97fc496
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Sat Mar 16 10:10:07 2024 +0100
Improved: ORDER - Move from hard-code menu location to parameterized
(OFBIZ-12944) (#729)
Move the menu location in the various order screens from hard-coded to
parameterized.
modified:
- AllocationPlanScreens.xml
- CommonScreens.xml
- CustRequestScreens.xml
- OrderEntryCommonScreens.xml
- OrderViewScreens.xml
- QuoteScreens.xml
- QuoteWorkEffortScreens.xml
- RequirementScreens.xml
---
applications/order/widget/ordermgr/AllocationPlanScreens.xml | 2 +-
applications/order/widget/ordermgr/CommonScreens.xml | 8 ++++----
applications/order/widget/ordermgr/CustRequestScreens.xml | 4 ++--
applications/order/widget/ordermgr/OrderEntryCommonScreens.xml | 2 +-
applications/order/widget/ordermgr/OrderViewScreens.xml | 4 ++--
applications/order/widget/ordermgr/QuoteScreens.xml | 8 ++++----
applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml | 2 +-
applications/order/widget/ordermgr/RequirementScreens.xml | 8 ++++----
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/applications/order/widget/ordermgr/AllocationPlanScreens.xml
b/applications/order/widget/ordermgr/AllocationPlanScreens.xml
index b3828c700a..d49b528680 100644
--- a/applications/order/widget/ordermgr/AllocationPlanScreens.xml
+++ b/applications/order/widget/ordermgr/AllocationPlanScreens.xml
@@ -25,7 +25,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
diff --git a/applications/order/widget/ordermgr/CommonScreens.xml
b/applications/order/widget/ordermgr/CommonScreens.xml
index 06b968ced8..80e379525c 100644
--- a/applications/order/widget/ordermgr/CommonScreens.xml
+++ b/applications/order/widget/ordermgr/CommonScreens.xml
@@ -43,7 +43,7 @@ under the License.
<!-- <set field="layoutSettings.headerRightBackgroundUrl"
value="" global="true"/> -->
<set field="activeApp" value="ordermgr" global="true"/>
<set field="applicationMenuName" value="OrderAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://order/widget/ordermgr/OrderMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_order"/>
<set field="applicationTitle"
from-field="uiLabelMap.OrderManagerApplication" global="true"/>
<!-- globally parameterize the link to a customer's detail
information, to help with cases when such details are accessed via external
application. -->
@@ -69,12 +69,12 @@ under the License.
<not><if-empty field="custRequest"/></not>
</condition>
<widgets>
- <include-menu name="RequestTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="RequestTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
<decorator-section name="body">
- <include-menu name="RequestSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="RequestSubTabBar"
location="${parameters.mainMenuLocation}"/>
<container>
<section>
<condition>
@@ -140,7 +140,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="OrderShortcutAppBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="OrderShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/order/widget/ordermgr/CustRequestScreens.xml
b/applications/order/widget/ordermgr/CustRequestScreens.xml
index f905263e79..aa429ee573 100644
--- a/applications/order/widget/ordermgr/CustRequestScreens.xml
+++ b/applications/order/widget/ordermgr/CustRequestScreens.xml
@@ -48,7 +48,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
@@ -570,7 +570,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.OrderIncomingCustRequests}"
navigation-menu-name="RequestScreenletMenu">
- <include-menu name="RequestScreenletMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="RequestScreenletMenu"
location="${parameters.mainMenuLocation}"/>
<include-form name="ListRequestList"
location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</widgets>
diff --git a/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
b/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
index 8c2561bcd9..3d1cd12b3c 100644
--- a/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
+++ b/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
@@ -27,7 +27,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"/>
diff --git a/applications/order/widget/ordermgr/OrderViewScreens.xml
b/applications/order/widget/ordermgr/OrderViewScreens.xml
index 7db7db010e..92e101a591 100644
--- a/applications/order/widget/ordermgr/OrderViewScreens.xml
+++ b/applications/order/widget/ordermgr/OrderViewScreens.xml
@@ -23,7 +23,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -48,7 +48,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<include-portal-page id="OrderPortalPage"/>
diff --git a/applications/order/widget/ordermgr/QuoteScreens.xml
b/applications/order/widget/ordermgr/QuoteScreens.xml
index 5fcd0da846..48b5b70f44 100644
--- a/applications/order/widget/ordermgr/QuoteScreens.xml
+++ b/applications/order/widget/ordermgr/QuoteScreens.xml
@@ -28,7 +28,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -43,8 +43,8 @@ under the License.
</condition>
<widgets>
<label
style="h1">${uiLabelMap.CommonQuote}:${quote.quoteId}</label>
- <include-menu name="QuoteTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
- <include-menu name="QuoteSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="QuoteTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="QuoteSubTabBar"
location="${parameters.mainMenuLocation}"/>
<container style="page-title">
</container>
</widgets>
@@ -77,7 +77,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
diff --git a/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
b/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
index b2beed1d07..61caee6b25 100644
--- a/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
+++ b/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
@@ -40,7 +40,7 @@ under the License.
<not><if-empty field="quote"/></not>
</condition>
<widgets>
- <include-menu name="QuoteTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="QuoteTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<container>
diff --git a/applications/order/widget/ordermgr/RequirementScreens.xml
b/applications/order/widget/ordermgr/RequirementScreens.xml
index 819f4670d4..ee2226f2f9 100644
--- a/applications/order/widget/ordermgr/RequirementScreens.xml
+++ b/applications/order/widget/ordermgr/RequirementScreens.xml
@@ -25,7 +25,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -37,7 +37,7 @@ under the License.
<section>
<condition><not><if-empty
field="requirement"/></not></condition>
<widgets>
- <include-menu name="RequirementTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="RequirementTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<container>
@@ -59,7 +59,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -68,7 +68,7 @@ under the License.
<if-has-permission permission="ORDERMGR"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="RequirementsTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="RequirementsTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
