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 d897eff66e improved: have profileMenuLocation (OFBIZ-12981) (#749)
d897eff66e is described below
commit d897eff66e8bc8bc3c8851a2d8882f759b41e0cf
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Fri Apr 12 09:55:28 2024 +0200
improved: have profileMenuLocation (OFBIZ-12981) (#749)
* Improved: ORDER - have requestMenuLocation (OFBIZ-12991)
Given that request screens are used as portal pages, the inclusion of such
portal pages in other applications leads to errors being thrown for the
associated menus (due to the use of the mainMenuLocation parameter in web.xml).
Having a requestMenuLocation in web.xml solves this issue.
modified:
- web.xml: add contextParam requestMenuLocation
- CommonScreens.xml: change location request related menus
- CustRequestScreens.xml: change location request related menu
* Improved: have profileMenuLocation (OFBIZ- 12981)
Profile screens are used in various components as portalpageportlets, and
have references to various party menus. As menus in the various profile screens
are parameterized to use ${parameters.mainMenuLocation} this generates errors
in the components/applications where these screens are used as portal page
elements.
Having a context-param profileMenuLocation resolves this issue.
modified:
web.xml: added context-param profileMenuLocation
* Improved: have profileMenuLocation (OFBIZ- 12981)
Profile screens are used in various components as portalpageportlets, and
have references to various party menus. As menus in the various profile screens
are parameterized to use ${parameters.mainMenuLocation} this generates errors
in the components/applications where these screens are used as portal page
elements.
Having a context-param profileMenuLocation resolves this issue.
modified:
ProfileScreens.xml: change menu locations
---
applications/party/webapp/partymgr/WEB-INF/web.xml | 5 +++++
applications/party/widget/partymgr/ProfileScreens.xml | 12 ++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/applications/party/webapp/partymgr/WEB-INF/web.xml
b/applications/party/webapp/partymgr/WEB-INF/web.xml
index 83fbfa3d10..2e67dfe4ca 100644
--- a/applications/party/webapp/partymgr/WEB-INF/web.xml
+++ b/applications/party/webapp/partymgr/WEB-INF/web.xml
@@ -48,6 +48,11 @@ under the License.
<param-name>communicationMenuLocation</param-name>
<param-value>component://party/widget/partymgr/PartyMenus.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the profile screen menus file to be used
in this webapp; referred to as a context variable in screen def XML
files.</description>
+ <param-name>profileMenuLocation</param-name>
+
<param-value>component://party/widget/partymgr/PartyMenus.xml</param-value>
+ </context-param>
<filter>
<display-name>ControlFilter</display-name>
diff --git a/applications/party/widget/partymgr/ProfileScreens.xml
b/applications/party/widget/partymgr/ProfileScreens.xml
index fb02390f51..1af440cb2b 100644
--- a/applications/party/widget/partymgr/ProfileScreens.xml
+++ b/applications/party/widget/partymgr/ProfileScreens.xml
@@ -63,7 +63,7 @@
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PartyPersonalInformation}"
navigation-menu-name="PersonUpdate" id="PartyPersonalInformationPanel">
- <include-menu name="PersonUpdate"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="PersonUpdate"
location="${parameters.profileMenuLocation}"/>
<include-form name="ViewPartyPerson"
location="component://party/widget/partymgr/PartyForms.xml"/>
<section>
<condition>
@@ -102,7 +102,7 @@
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PartyPartyGroupInformation}"
navigation-menu-name="GroupUpdate" id="PartyGroupInformationPanel">
- <include-menu name="GroupUpdate"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="GroupUpdate"
location="${parameters.profileMenuLocation}"/>
<include-form name="ViewPartyGroup"
location="component://party/widget/partymgr/PartyForms.xml"/>
<section>
<condition>
@@ -160,7 +160,7 @@
</actions>
<widgets>
<screenlet title="${uiLabelMap.PartyPartyIdentifications}"
navigation-menu-name="NewPartyIdentification" id="PartyIdentificationPanel">
- <include-menu name="NewPartyIdentification"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="NewPartyIdentification"
location="${parameters.profileMenuLocation}"/>
<include-form name="ListPartyIdentification"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
</widgets>
@@ -493,7 +493,7 @@
</actions>
<widgets>
<screenlet title="${uiLabelMap.PartyShipperAccount}"
navigation-menu-name="AddShipper">
- <include-menu name="AddShipper"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="AddShipper"
location="${parameters.profileMenuLocation}"/>
<include-form name="ListCarrierAccounts"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
</widgets>
@@ -528,7 +528,7 @@
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PartyListRelatedContacts}"
navigation-menu-name="AddRelAccountContacts">
- <include-menu name="AddRelAccountContacts"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="AddRelAccountContacts"
location="${parameters.profileMenuLocation}"/>
<section>
<condition>
<not><if-empty
field="parameters.editPartyRel"/></not>
@@ -563,7 +563,7 @@
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PartyListRelatedAccounts}"
navigation-menu-name="AddRelContactAccounts">
- <include-menu name="AddRelContactAccounts"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="AddRelContactAccounts"
location="${parameters.profileMenuLocation}"/>
<section>
<condition>
<not><if-empty
field="parameters.editPartyRel"/></not>
