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 fb3a59f3ee Improved: PARTY - Move from hard-code menu location to
parameterized (OFBIZ-12945) (#730)
fb3a59f3ee is described below
commit fb3a59f3ee3f455cd4b1ca354e9da263765eaf17
Author: Pierre Smits <[email protected]>
AuthorDate: Sat Mar 16 15:05:38 2024 +0100
Improved: PARTY - Move from hard-code menu location to parameterized
(OFBIZ-12945) (#730)
Move the menu location in the various party screens from hard-coded to
parameterized.
modified:
- CommonScreens.xml
- CommunicationEventScreens.xml
- PartyClassificationScreens.xml
- PartyForms.xml
- PartyInvitationScreens.xml
- PartyScreens.xml
- ProfileScreens.xml
- VisitScreens.xml
---
applications/party/widget/partymgr/CommonScreens.xml | 10 +++++-----
.../widget/partymgr/CommunicationEventScreens.xml | 20 ++++++++++----------
.../widget/partymgr/PartyClassificationScreens.xml | 8 ++++----
applications/party/widget/partymgr/PartyForms.xml | 2 +-
.../party/widget/partymgr/PartyInvitationScreens.xml | 8 ++++----
applications/party/widget/partymgr/PartyScreens.xml | 8 ++++----
.../party/widget/partymgr/ProfileScreens.xml | 12 ++++++------
applications/party/widget/partymgr/VisitScreens.xml | 4 ++--
8 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/applications/party/widget/partymgr/CommonScreens.xml
b/applications/party/widget/partymgr/CommonScreens.xml
index 44318d7d6e..b292e4ece0 100644
--- a/applications/party/widget/partymgr/CommonScreens.xml
+++ b/applications/party/widget/partymgr/CommonScreens.xml
@@ -48,7 +48,7 @@ under the License.
<set field="layoutSettings.styleSheets[]"
value="/partymgr/static/partymgr.css" global="true"/>
<set field="activeApp" value="partymgr" global="true"/>
<set field="applicationMenuName" value="PartyAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://party/widget/partymgr/PartyMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_party"/>
<set field="applicationTitle"
from-field="uiLabelMap.PartyManagerApplication" global="true"/>
</actions>
@@ -68,7 +68,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -77,7 +77,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="ProfileTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="ProfileTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -91,7 +91,7 @@ under the License.
<section>
<condition><not><if-empty
field="partyId"/></not></condition>
<widgets>
- <include-menu name="ProfileSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="ProfileSubTabBar"
location="${parameters.mainMenuLocation}"/>
<container style="clear"/>
<container style="page-title">
<section>
@@ -156,7 +156,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="PartyShortcutAppBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="PartyShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/party/widget/partymgr/CommunicationEventScreens.xml
b/applications/party/widget/partymgr/CommunicationEventScreens.xml
index 1d24800ff7..320ecac5b4 100644
--- a/applications/party/widget/partymgr/CommunicationEventScreens.xml
+++ b/applications/party/widget/partymgr/CommunicationEventScreens.xml
@@ -29,14 +29,14 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<if-has-permission permission="PARTYMGR"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="CommEventTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
- <include-menu name="CommSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="CommEventTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="CommSubTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -66,8 +66,8 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="CommEventTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
- <include-menu name="CommSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="CommEventTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="CommSubTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -111,10 +111,10 @@ under the License.
<not><if-empty field="partyId"/></not>
</condition>
<widgets>
- <include-menu name="ProfileTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="ProfileTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
- <include-menu name="CommFindTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="CommFindTabBar"
location="${parameters.mainMenuLocation}"/>
<container><label style="h1"
text="${uiLabelMap.PartyPendingCommunicationEvents}"/></container>
<container>
<link style="smallSubmit"
target="ViewCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}">
@@ -803,7 +803,7 @@ under the License.
<not><if-empty field="partyId"/></not>
</condition>
<widgets>
- <include-menu name="ProfileTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="ProfileTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<container style="h1"><label
text="${uiLabelMap.PageTitleEditCommContent}"/></container>
@@ -877,7 +877,7 @@ under the License.
<widgets>
<screenlet title="${uiLabelMap.PartyCommunicationsOfParty}:
${partyName.firstName} ${partyName.middleName} ${partyName.lastName}
${partyName.groupName} [${partyId}] "
navigation-menu-name="CommunicationsMenu"
navigation-form-name="ListPartyCommEvents" name="myComms">
- <include-menu name="CommunicationsMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="CommunicationsMenu"
location="${parameters.mainMenuLocation}"/>
<section><!-- List my communication events -->
<condition>
<or>
@@ -901,7 +901,7 @@ under the License.
<set field="partyIdFrom"
from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
</actions>
<widgets>
- <include-menu name="MyCommSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MyCommSubTabBar"
location="${parameters.mainMenuLocation}"/>
<include-screen name="commOverview"/>
</widgets>
</section>
diff --git a/applications/party/widget/partymgr/PartyClassificationScreens.xml
b/applications/party/widget/partymgr/PartyClassificationScreens.xml
index c2e38dd798..43cf768117 100644
--- a/applications/party/widget/partymgr/PartyClassificationScreens.xml
+++ b/applications/party/widget/partymgr/PartyClassificationScreens.xml
@@ -60,13 +60,13 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <include-menu name="PartyClassificationTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="PartyClassificationTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -105,7 +105,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PartyClassificationGroups}">
@@ -139,7 +139,7 @@ under the License.
<if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <include-menu name="PartyClassificationTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="PartyClassificationTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
diff --git a/applications/party/widget/partymgr/PartyForms.xml
b/applications/party/widget/partymgr/PartyForms.xml
index 9bc3d43ce5..40feb9b16e 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -163,7 +163,7 @@ under the License.
<field name="mainRole" title="${uiLabelMap.PartyMainRole}"><display
description="${mainRole.description}"/></field>
<field name="createdDate" sort-field="true"><display
type="date"/></field>
<field name="lastModifiedDate" sort-field="true"><display
type="date"/></field>
- <field name="partyAction" title=" "><include-menu
name="ListPartyAction"
location="component://party/widget/partymgr/PartyMenus.xml"/></field>
+ <field name="partyAction" title=" "><include-menu
name="ListPartyAction" location="${parameters.mainMenuLocation}"/></field>
<sort-order>
<last-field name="createdDate"/>
<last-field name="lastModifiedDate"/>
diff --git a/applications/party/widget/partymgr/PartyInvitationScreens.xml
b/applications/party/widget/partymgr/PartyInvitationScreens.xml
index f72151b202..6ff8fb4676 100644
--- a/applications/party/widget/partymgr/PartyInvitationScreens.xml
+++ b/applications/party/widget/partymgr/PartyInvitationScreens.xml
@@ -30,7 +30,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -39,7 +39,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="PartyInvitationTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="PartyInvitationTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -82,7 +82,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -123,7 +123,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
diff --git a/applications/party/widget/partymgr/PartyScreens.xml
b/applications/party/widget/partymgr/PartyScreens.xml
index 7d39873af6..ffeca925b2 100644
--- a/applications/party/widget/partymgr/PartyScreens.xml
+++ b/applications/party/widget/partymgr/PartyScreens.xml
@@ -42,7 +42,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<platform-specific><html><html-template
multi-block="true"
location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific>
@@ -54,7 +54,7 @@ under the License.
<widgets>
<screenlet id="FindPartyPanel"
title="${uiLabelMap.PartyFindParty}" navigation-menu-name="CreateNewParty"
navigation-form-name="LookupParty"
save-collapsed="false" collapsible="true"
initially-collapsed="${initialyCollapsed}">
- <include-menu name="CreateNewParty"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="CreateNewParty"
location="${parameters.mainMenuLocation}"/>
<include-form name="LookupParty"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.CommonSearchResults}" navigation-form-name="ListParty">
@@ -1314,7 +1314,7 @@ under the License.
<include-grid name="ListPartyIdentification"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PartyPartyIdentification}"
navigation-menu-name="NewPartyIdentification"
id="PartyIdentificationCreationPanel">
- <include-menu name="NewPartyIdentification"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="NewPartyIdentification"
location="${parameters.mainMenuLocation}"/>
<include-form name="EditPartyIdentification"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
</decorator-section>
@@ -1395,7 +1395,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyParty}
${uiLabelMap.CommonImportExport} ID Name, single role (employee, customer,
supplier) and contactmechs">
diff --git a/applications/party/widget/partymgr/ProfileScreens.xml
b/applications/party/widget/partymgr/ProfileScreens.xml
index 97b7a684f9..fb02390f51 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="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="PersonUpdate"
location="${parameters.mainMenuLocation}"/>
<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="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="GroupUpdate"
location="${parameters.mainMenuLocation}"/>
<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="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="NewPartyIdentification"
location="${parameters.mainMenuLocation}"/>
<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="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="AddShipper"
location="${parameters.mainMenuLocation}"/>
<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="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="AddRelAccountContacts"
location="${parameters.mainMenuLocation}"/>
<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="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="AddRelContactAccounts"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<not><if-empty
field="parameters.editPartyRel"/></not>
diff --git a/applications/party/widget/partymgr/VisitScreens.xml
b/applications/party/widget/partymgr/VisitScreens.xml
index b946d992b2..389696f90f 100644
--- a/applications/party/widget/partymgr/VisitScreens.xml
+++ b/applications/party/widget/partymgr/VisitScreens.xml
@@ -31,7 +31,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -68,7 +68,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<include-screen name="LoggedInUsersScreen" />
