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 5fb4940734 Improved: FACILITY- Move from hard-coded menu location to
parameterized (OFBIZ-12976) (#754)
5fb4940734 is described below
commit 5fb4940734f0107c4075b3850ff92115fc6aed66
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Sat Apr 13 12:53:24 2024 +0200
Improved: FACILITY- Move from hard-coded menu location to parameterized
(OFBIZ-12976) (#754)
Move the menu location in the various facility screens from hard-coded to
parameterized.
modified: CommonScreens.xml, FacilityGroupScreens.xml, FacilityScreens.xml
changed location of various menus from hard-coded to parameterized
---
.../product/widget/facility/CommonScreens.xml | 12 +++++------
.../widget/facility/FacilityGroupScreens.xml | 2 +-
.../product/widget/facility/FacilityScreens.xml | 24 +++++++++++-----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/applications/product/widget/facility/CommonScreens.xml
b/applications/product/widget/facility/CommonScreens.xml
index 0f0043a76d..d5dd6d2098 100644
--- a/applications/product/widget/facility/CommonScreens.xml
+++ b/applications/product/widget/facility/CommonScreens.xml
@@ -41,7 +41,7 @@ under the License.
<!-- <set field="layoutSettings.headerRightBackgroundUrl"
value="" global="true"/> -->
<set field="activeApp" value="facilitymgr" global="true"/>
<set field="applicationMenuName" value="FacilityAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://product/widget/facility/FacilityMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_facility"/>
<set field="applicationTitle"
from-field="uiLabelMap.ProductFacilityManagerApplication" global="true"/>
</actions>
@@ -74,7 +74,7 @@ under the License.
</or>
</condition>
<widgets>
- <include-menu name="FacilityTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="FacilityTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
<fail-widgets>
<label
style="h3">${uiLabelMap.ProductErrorFacilityIdNotFound}</label>
@@ -92,7 +92,7 @@ under the License.
<if-service-permission
service-name="facilityGenericPermission" main-action="VIEW"/>
</condition>
<widgets>
- <include-menu name="FacilityActionBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="FacilityActionBar"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<or>
@@ -127,7 +127,7 @@ under the License.
<if-has-permission permission="FACILITY"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="InventoryItemLabelsTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="InventoryItemLabelsTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -167,8 +167,8 @@ under the License.
<not><if-empty
field="inventoryItemLabel"/></not>
</condition>
<widgets>
- <include-menu
name="InventoryItemLabelsTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
- <include-menu
name="InventoryItemLabelTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu
name="InventoryItemLabelsTabBar" location="${parameters.mainMenuLocation}"/>
+ <include-menu
name="InventoryItemLabelTabBar" location="${parameters.mainMenuLocation}"/>
<label
style="h1">${uiLabelMap.ProductInventoryItemLabel}
[${inventoryItemLabelId}]</label>
<decorator-section-include
name="body"/>
</widgets>
diff --git a/applications/product/widget/facility/FacilityGroupScreens.xml
b/applications/product/widget/facility/FacilityGroupScreens.xml
index 4b0d02b69f..ac399b160a 100644
--- a/applications/product/widget/facility/FacilityGroupScreens.xml
+++ b/applications/product/widget/facility/FacilityGroupScreens.xml
@@ -56,7 +56,7 @@ under the License.
<if-has-permission permission="FACILITY"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="FacilityGroupTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="FacilityGroupTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
diff --git a/applications/product/widget/facility/FacilityScreens.xml
b/applications/product/widget/facility/FacilityScreens.xml
index b6bd774dd6..0f4306524c 100644
--- a/applications/product/widget/facility/FacilityScreens.xml
+++ b/applications/product/widget/facility/FacilityScreens.xml
@@ -50,8 +50,8 @@ under the License.
<if-service-permission
service-name="facilityGenericPermission" main-action="VIEW"/>
</condition>
<widgets>
- <include-menu
name="FacilityTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
- <include-menu
name="FacilityActionBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu
name="FacilityTabBar" location="${parameters.mainMenuLocation}"/>
+ <include-menu
name="FacilityActionBar" location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<not><if-empty
field="facilityId"/></not>
@@ -77,7 +77,7 @@ under the License.
<if-compare field="showScreen"
value="ten" operator="equals"/>
</condition>
<widgets>
- <include-menu name="FacilityActionBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="FacilityActionBar"
location="${parameters.mainMenuLocation}"/>
<label
text="${uiLabelMap.FacilitySelection}" style="h1"/>
<screenlet>
<include-form
name="FindFacility10"
location="component://product/widget/facility/FacilityForms.xml"/>
@@ -89,7 +89,7 @@ under the License.
<if-compare field="showScreen"
value="more" operator="equals"/>
</condition>
<widgets>
- <include-menu name="FacilityActionBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="FacilityActionBar"
location="${parameters.mainMenuLocation}"/>
<decorator-screen
name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section
name="search-options">
<include-form
name="FindFacilityOptions"
location="component://product/widget/facility/FacilityForms.xml"/>
@@ -432,7 +432,7 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
- <include-menu
name="ViewFacilityInventoryByProductTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu
name="ViewFacilityInventoryByProductTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
<include-form
name="FindFacilityInventoryByProduct"
location="component://product/widget/facility/FacilityForms.xml"/>
@@ -607,7 +607,7 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
- <include-menu
name="ViewFacilityInventoryByProductTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu
name="ViewFacilityInventoryByProductTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet
title="${uiLabelMap.ProductInventoryItemTotals} ${uiLabelMap.CommonFor}
${facility.facilityName}">
<include-grid name="ListInventoryItemTotals"
location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
@@ -631,7 +631,7 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
- <include-menu
name="ViewFacilityInventoryByProductTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu
name="ViewFacilityInventoryByProductTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet title="${title}">
<include-grid name="ListInventoryItemGrandTotals"
location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
@@ -683,7 +683,7 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
- <include-menu
name="ViewFacilityInventoryByProductTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu
name="ViewFacilityInventoryByProductTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet
title="${uiLabelMap.ProductInventoryAverageCosts} ${uiLabelMap.CommonFor}
${facility.facilityName}">
<include-grid name="ListInventoryAverageCosts"
location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
@@ -892,7 +892,7 @@ under the License.
<not><if-empty field="inventoryItem"/></not>
</condition>
<widgets>
- <include-menu name="InventoryItemTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="InventoryItemTabBar"
location="${parameters.mainMenuLocation}"/>
<container style="h1">
<label
text="${uiLabelMap.PageTitleEditInventoryItem}"/>
</container>
@@ -966,7 +966,7 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InventoryItemTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="InventoryItemTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet
title="${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor}
[${inventoryItemId}]">
<include-grid name="ListInventoryItemDetail"
location="component://product/widget/facility/InventoryForms.xml"/>
</screenlet>
@@ -999,7 +999,7 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InventoryItemTabBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="InventoryItemTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet id="AddInventoryItemLabelPanel"
title="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor}
[${inventoryItemId}]" collapsible="true">
<include-form name="AddInventoryItemLabelAppl"
location="component://product/widget/facility/InventoryForms.xml"/>
</screenlet>
@@ -1582,7 +1582,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="FacilityShortcutAppBar"
location="component://product/widget/facility/FacilityMenus.xml"/>
+ <include-menu name="FacilityShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
