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 e2f7b7fcd4 Improved: MFG- Move from hard-coded menu location to
parameterized (OFBIZ-12980) (#755)
e2f7b7fcd4 is described below
commit e2f7b7fcd468d9a46aa0a14f99187fb68b53d348
Author: Pierre Smits <[email protected]>
AuthorDate: Sun Apr 14 12:11:35 2024 +0200
Improved: MFG- Move from hard-coded menu location to parameterized
(OFBIZ-12980) (#755)
Move the menu location in various manufacturing screens to parameterized
modified:BomScreens.xml, CalendarScreens.xml, CommonScreens.xml,
JobshopScreens.xml, MrpScreens.xml, RoutingScreens.xml
- changed location of menus from hard-coded too parameterized
---
applications/manufacturing/widget/manufacturing/BomScreens.xml | 2 +-
applications/manufacturing/widget/manufacturing/CalendarScreens.xml | 2 +-
applications/manufacturing/widget/manufacturing/CommonScreens.xml | 6 +++---
applications/manufacturing/widget/manufacturing/JobshopScreens.xml | 6 +++---
applications/manufacturing/widget/manufacturing/MrpScreens.xml | 2 +-
applications/manufacturing/widget/manufacturing/RoutingScreens.xml | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/applications/manufacturing/widget/manufacturing/BomScreens.xml
b/applications/manufacturing/widget/manufacturing/BomScreens.xml
index 74bed074f2..9d1ca2b29d 100644
--- a/applications/manufacturing/widget/manufacturing/BomScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/BomScreens.xml
@@ -31,7 +31,7 @@ under the License.
<if-has-permission permission="MANUFACTURING"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="BomTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu name="BomTabBar"
location="${parameters.mainMenuLocation}"/>
<container style="button-bar"><link
target="EditProductBom" text="${uiLabelMap.ManufacturingCreateBom}"
style="buttontext"/></container>
<decorator-section-include name="body"/>
</widgets>
diff --git
a/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
b/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
index 92a9a5766a..bee007f8be 100644
--- a/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
@@ -27,7 +27,7 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="CalendarTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu name="CalendarTabBar"
location="${parameters.mainMenuLocation}"/>
<container style="button-bar">
<link style="buttontext"
target="EditCalendar" text="${uiLabelMap.ManufacturingNewCalendar}"/>
<link style="buttontext"
target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/>
diff --git a/applications/manufacturing/widget/manufacturing/CommonScreens.xml
b/applications/manufacturing/widget/manufacturing/CommonScreens.xml
index b7391532ee..e43f405660 100644
--- a/applications/manufacturing/widget/manufacturing/CommonScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/CommonScreens.xml
@@ -41,7 +41,7 @@ under the License.
<!-- <set field="layoutSettings.headerRightBackgroundUrl"
value="" global="true"/> -->
<set field="activeApp" value="manufacturing" global="true"/>
<set field="applicationMenuName" value="ManufacturingAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"
global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="applicationTitle"
from-field="uiLabelMap.ManufacturingManagerApplication" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_manufacturing"/>
</actions>
@@ -56,7 +56,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"
name="MainActionMenu"/>
+ <include-menu
location="${parameters.mainMenuLocation}" name="MainActionMenu"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -85,7 +85,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="ManufacturingShortcutAppBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu name="ManufacturingShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
b/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
index 2e354de89d..e71b6e1a1d 100644
--- a/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
@@ -32,7 +32,7 @@ under the License.
<not><if-empty
field="productionRun"/></not>
</condition>
<widgets>
- <include-menu
name="ProductionRunTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu
name="ProductionRunTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<container>
@@ -114,7 +114,7 @@ under the License.
<decorator-screen name="CommonJobshopDecorator"
location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"
navigation-menu-name="ProductionRunStatusAction">
- <include-menu name="ProductionRunStatusTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu name="ProductionRunStatusTabBar"
location="${parameters.mainMenuLocation}"/>
<include-form name="UpdateProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
<section>
@@ -194,7 +194,7 @@ under the License.
<decorator-screen name="CommonJobshopDecorator"
location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"
navigation-menu-name="ProductionRunStatusAction">
- <include-menu name="ProductionRunStatusTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu name="ProductionRunStatusTabBar"
location="${parameters.mainMenuLocation}"/>
<include-form name="ShowProductionRun"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
<section>
diff --git a/applications/manufacturing/widget/manufacturing/MrpScreens.xml
b/applications/manufacturing/widget/manufacturing/MrpScreens.xml
index 8605fc34d5..3997e0ea23 100644
--- a/applications/manufacturing/widget/manufacturing/MrpScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/MrpScreens.xml
@@ -27,7 +27,7 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="MrpTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu name="MrpTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</widgets>
</section>
diff --git a/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
b/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
index fda4ecfe24..4b8446e05e 100644
--- a/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
@@ -37,7 +37,7 @@ under the License.
</condition>
<widgets>
<label
style="h1">${uiLabelMap.CommonRouting}: ${routing.workEffortId}</label>
- <include-menu name="RoutingTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu name="RoutingTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<decorator-section-include name="body"/>
@@ -65,7 +65,7 @@ under the License.
</condition>
<widgets>
<label
style="h1">${uiLabelMap.WorkEffortTask}: ${routingTask.workEffortId}</label>
- <include-menu name="RoutingTaskTabBar"
location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+ <include-menu name="RoutingTaskTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<decorator-section-include name="body"/>
