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 035f3dcf6 Improved: ISMGR - Move from hard-coded menu location to
parameterized (OFBIZ-12954) (#95)
035f3dcf6 is described below
commit 035f3dcf669781588896b71e2b2efc26dbfd6a6e
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Thu Mar 21 18:52:09 2024 +0100
Improved: ISMGR - Move from hard-coded menu location to parameterized
(OFBIZ-12954) (#95)
Move the menu location in the various ismgr screens from hard-coded to
parameterized.
modified:
- CommonScreens.xml
- FixedAssetScreens.xml
---
assetmaint/widget/ismgr/CommonScreens.xml | 10 +++++-----
assetmaint/widget/ismgr/FixedAssetScreens.xml | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/assetmaint/widget/ismgr/CommonScreens.xml
b/assetmaint/widget/ismgr/CommonScreens.xml
index db660e2a8..ca6d869d5 100644
--- a/assetmaint/widget/ismgr/CommonScreens.xml
+++ b/assetmaint/widget/ismgr/CommonScreens.xml
@@ -33,7 +33,7 @@ under the License.
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
<set field="activeApp" value="ismgr" global="true"/>
<set field="applicationMenuName" value="IsMgrAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://assetmaint/widget/ismgr/Menus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_apache_ofbiz_plugins"/>
<set field="layoutSettings.companyName"
from-field="uiLabelMap.IsMgrCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.IsMgrCompanySubtitle" global="true"/>
@@ -61,7 +61,7 @@ under the License.
<not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
- <include-menu name="ComputerHardwareTabBar"
location="component://assetmaint/widget/ismgr/Menus.xml"/>
+ <include-menu name="ComputerHardwareTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<decorator-section-include name="pre-body"/>
@@ -69,7 +69,7 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="FixedAssetSubTabBar"
location="component://assetmaint/widget/ismgr/Menus.xml"/>
+ <include-menu name="FixedAssetSubTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<section>
@@ -115,7 +115,7 @@ under the License.
<not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
- <include-menu name="ComputerHardwareTabBar"
location="component://assetmaint/widget/ismgr/Menus.xml"/>
+ <include-menu name="ComputerHardwareTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<decorator-section-include name="pre-body"/>
@@ -124,7 +124,7 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="FixedAssetSubTabBar"
location="component://assetmaint/widget/ismgr/Menus.xml"/>
+ <include-menu name="FixedAssetSubTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<section>
diff --git a/assetmaint/widget/ismgr/FixedAssetScreens.xml
b/assetmaint/widget/ismgr/FixedAssetScreens.xml
index 5618dc99c..70373770b 100644
--- a/assetmaint/widget/ismgr/FixedAssetScreens.xml
+++ b/assetmaint/widget/ismgr/FixedAssetScreens.xml
@@ -54,7 +54,7 @@ under the License.
<decorator-section name="menu-bar">
<section>
<widgets>
- <include-menu
name="FixedAssetSubTabBar"
location="component://assetmaint/widget/ismgr/Menus.xml"/>
+ <include-menu
name="FixedAssetSubTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -103,7 +103,7 @@ under the License.
<decorator-section name="menu-bar">
<section>
<widgets>
- <include-menu
name="FixedAssetSubTabBar"
location="component://assetmaint/widget/ismgr/Menus.xml"/>
+ <include-menu
name="FixedAssetSubTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
