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-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6ffc3aa2d Improved: AssetMaint - Move from hard-coded menu location to
parameterized (OFBIZ-12952) (#94)
6ffc3aa2d is described below
commit 6ffc3aa2daefc026df04f4da626a03ad657ee11d
Author: Pierre Smits <[email protected]>
AuthorDate: Wed Mar 20 10:41:10 2024 +0100
Improved: AssetMaint - Move from hard-coded menu location to parameterized
(OFBIZ-12952) (#94)
Move the menu location in the various assetmaint screens from hard-coded to
parameterized.
modified:
- AssetmaintScreens.xml
- CommonScreens.xml
---
assetmaint/widget/AssetmaintScreens.xml | 4 ++--
assetmaint/widget/CommonScreens.xml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/assetmaint/widget/AssetmaintScreens.xml
b/assetmaint/widget/AssetmaintScreens.xml
index 5ebb96407..a7dda24e5 100644
--- a/assetmaint/widget/AssetmaintScreens.xml
+++ b/assetmaint/widget/AssetmaintScreens.xml
@@ -33,7 +33,7 @@
<section>
<condition><not><if-empty
field="maintHistSeqId"/></not></condition>
<widgets>
- <include-menu name="FixedAssetMaintTabBar"
location="component://assetmaint/widget/AssetmaintMenus.xml"/>
+ <include-menu name="FixedAssetMaintTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -118,7 +118,7 @@
<actions><set field="titleProperty"
value="AccountingAddFixedAssetMaintenance"/></actions>
<widgets/>
</section>
- <decorator-screen name="CommonFixedAssetMaintDecorator">
+ <decorator-screen name="CommonFixedAssetMaintDecorator"
location="${parametes.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition><not><if-empty
field="maintHistSeqId"/></not></condition>
diff --git a/assetmaint/widget/CommonScreens.xml
b/assetmaint/widget/CommonScreens.xml
index fdca8843d..8be7eda0d 100644
--- a/assetmaint/widget/CommonScreens.xml
+++ b/assetmaint/widget/CommonScreens.xml
@@ -37,7 +37,7 @@ under the License.
then the global layoutSettings.commonHeaderImageUrl
(specified in GlobalDecorator) will be used. -->
<!--<set field="layoutSettings.headerImageUrl"
value="/images/ofbiz_logo.png" global="true"/>-->
<set field="applicationMenuName" value="AssetMaintAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://assetmaint/widget/AssetmaintMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="applicationTitle"
from-field="uiLabelMap.AssetMaintApplication"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_asset_maintenance_plugin"/>
</actions>
@@ -57,7 +57,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="FacilityTabBar"
location="component://assetmaint/widget/AssetmaintMenus.xml"/>
+ <include-menu name="FacilityTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -106,7 +106,7 @@ under the License.
<not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
- <include-menu name="FixedAssetTabBar"
location="component://assetmaint/widget/AssetmaintMenus.xml"/>
+ <include-menu name="FixedAssetTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<decorator-section-include name="pre-body"/>
