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 a0bf0d99e0 FIxed: MyCommSubTabBar is missing in SFA (OFBIZ-13031)
(#763)
a0bf0d99e0 is described below
commit a0bf0d99e05ea51f40898ebfbb72dd293dd61ebe
Author: Pierre Smits <[email protected]>
AuthorDate: Mon Apr 15 15:38:02 2024 +0200
FIxed: MyCommSubTabBar is missing in SFA (OFBIZ-13031) (#763)
* FIxed: MyCommSubTabBar is missing in SFA (OFBIZ-13031)
Party CommunicationEventScreens are also referenced in SFA
modified: CommunicationEventScreens.xml
changed menu location from mainMenuLocation to communicationMenuLocation
* FIxed: MyCommSubTabBar is missing in SFA (OFBIZ-13031)
Party CommunicationEventScreens are also referenced in SFA
modified: CommunicationEventScreens.xml OpportunityScreens.xml
- changed menu location from mainMenuLocation to communicationMenuLocation
---
applications/marketing/widget/sfa/OpportunityScreens.xml | 4 ++--
.../party/widget/partymgr/CommunicationEventScreens.xml | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/applications/marketing/widget/sfa/OpportunityScreens.xml
b/applications/marketing/widget/sfa/OpportunityScreens.xml
index cc4c41958c..55bd3d63ba 100644
--- a/applications/marketing/widget/sfa/OpportunityScreens.xml
+++ b/applications/marketing/widget/sfa/OpportunityScreens.xml
@@ -149,8 +149,8 @@ under the License.
<widgets>
<decorator-screen name="CommonOpportunityDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="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.communicationMenuLocation}"/>
+ <include-menu name="CommSubTabBar"
location="${parameters.communicationMenuLocation}"/>
<screenlet
title="${uiLabelMap.PageTitleListCommunications} ${partyId}">
<include-form name="ListCommEvents"
location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
</screenlet>
diff --git a/applications/party/widget/partymgr/CommunicationEventScreens.xml
b/applications/party/widget/partymgr/CommunicationEventScreens.xml
index d56d22a0b0..d6dc89e8a5 100644
--- a/applications/party/widget/partymgr/CommunicationEventScreens.xml
+++ b/applications/party/widget/partymgr/CommunicationEventScreens.xml
@@ -35,8 +35,8 @@ under the License.
<if-has-permission permission="PARTYMGR"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="CommEventTabBar"
location="${parameters.mainMenuLocation}"/>
- <include-menu name="CommSubTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="CommEventTabBar"
location="${parameters.communicationMenuLocation}"/>
+ <include-menu name="CommSubTabBar"
location="${parameters.communicationMenuLocation}"/>
</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="${parameters.mainMenuLocation}"/>
- <include-menu name="CommSubTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="CommEventTabBar"
location="${parameters.communicationMenuLocation}"/>
+ <include-menu name="CommSubTabBar"
location="${parameters.communicationMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -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="${parameters.mainMenuLocation}"/>
+ <include-menu name="MyCommSubTabBar"
location="${parameters.communicationMenuLocation}"/>
<include-screen name="commOverview"/>
</widgets>
</section>
