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 cd7a1272d0 Improved: SFA - Move from hard-code menu location to
parameterized (OFBIZ-12943) (#728)
cd7a1272d0 is described below
commit cd7a1272d085b2b9644630722423981fb83a0bc5
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Fri Mar 15 09:52:18 2024 +0100
Improved: SFA - Move from hard-code menu location to parameterized
(OFBIZ-12943) (#728)
Move the menu in the various sfa screens from hardcoded to parameterized.
modified:
- AccountScreens.xml
- CommonScreens.xml
- ContactScreens.xml
- ForecastScreens.xml
- LeadScreens.xml
---
.../marketing/widget/sfa/AccountScreens.xml | 4 ++--
.../marketing/widget/sfa/CommonScreens.xml | 28 +++++++++++-----------
.../marketing/widget/sfa/ContactScreens.xml | 4 ++--
.../marketing/widget/sfa/ForecastScreens.xml | 2 +-
applications/marketing/widget/sfa/LeadScreens.xml | 4 ++--
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/applications/marketing/widget/sfa/AccountScreens.xml
b/applications/marketing/widget/sfa/AccountScreens.xml
index 472aa2cf04..c7c6c0f41a 100644
--- a/applications/marketing/widget/sfa/AccountScreens.xml
+++ b/applications/marketing/widget/sfa/AccountScreens.xml
@@ -36,13 +36,13 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="AccountSubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="AccountSubTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<widgets>
<container style="no-clear">
<decorator-screen
name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section
name="search-options">
- <include-menu
name="AccountFindTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu
name="AccountFindTabBar" location="${parameters.mainMenuLocation}"/>
<include-form
name="FindAccounts"
location="component://marketing/widget/sfa/forms/AccountForms.xml"/>
</decorator-section>
<decorator-section
name="search-results">
diff --git a/applications/marketing/widget/sfa/CommonScreens.xml
b/applications/marketing/widget/sfa/CommonScreens.xml
index 3abca4c9ea..4e8da05639 100644
--- a/applications/marketing/widget/sfa/CommonScreens.xml
+++ b/applications/marketing/widget/sfa/CommonScreens.xml
@@ -38,7 +38,7 @@ under the License.
<set field="layoutSettings.companyName"
from-field="uiLabelMap.SfaCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.MarketingCompanySubtitle" global="true"/>
<set field="applicationMenuName" value="SfaAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://marketing/widget/sfa/SfaMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_sfa"/>
<set field="applicationTitle"
from-field="uiLabelMap.SfaManagerApplication" global="true"/>
<set field="parameters.parentPortalPageId"
from-field="parameters.parentPortalPageId" default-value="SFA" global="true"/>
@@ -81,7 +81,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="SfaShortcutAppBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="SfaShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -110,7 +110,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="OpportunityTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="OpportunityTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"/>
@@ -720,7 +720,7 @@ under the License.
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="OpportunitySubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="OpportunitySubTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet
title="${uiLabelMap.PageTitleListCommunications}">
<decorator-section-include name="body"/>
</screenlet>
@@ -730,13 +730,13 @@ under the License.
<fail-widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="OpportunityTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="OpportunityTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"/>
</decorator-section>
<decorator-section name="body">
- <include-menu name="OpportunitySubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="OpportunitySubTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -750,13 +750,13 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="AccountTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="AccountTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"/>
</decorator-section>
<decorator-section name="body">
- <include-menu name="AccountSubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="AccountSubTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -768,13 +768,13 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="ContactTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="ContactTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"/>
</decorator-section>
<decorator-section name="body">
- <include-menu name="ContactSubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="ContactSubTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -794,10 +794,10 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="LeadTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="LeadTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
- <include-menu name="LeadSubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="LeadSubTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -812,13 +812,13 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="EventTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="EventTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"/>
</decorator-section>
<decorator-section name="body">
- <include-menu name="EventSubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="EventSubTabBar"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
diff --git a/applications/marketing/widget/sfa/ContactScreens.xml
b/applications/marketing/widget/sfa/ContactScreens.xml
index 83773498ae..d8aa9a6a75 100644
--- a/applications/marketing/widget/sfa/ContactScreens.xml
+++ b/applications/marketing/widget/sfa/ContactScreens.xml
@@ -39,11 +39,11 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="ContactSubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="ContactSubTabBar"
location="${parameters.mainMenuLocation}"/>
<container style="no-clear">
<decorator-screen
name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section
name="search-options">
- <include-menu
name="ContactFindTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu
name="ContactFindTabBar" location="${parameters.mainMenuLocation}"/>
<include-form name="FindContacts"
location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
</decorator-section>
<decorator-section
name="search-results">
diff --git a/applications/marketing/widget/sfa/ForecastScreens.xml
b/applications/marketing/widget/sfa/ForecastScreens.xml
index 6de2312d50..17609e811e 100644
--- a/applications/marketing/widget/sfa/ForecastScreens.xml
+++ b/applications/marketing/widget/sfa/ForecastScreens.xml
@@ -37,7 +37,7 @@ under the License.
<section>
<condition><not><if-empty
field="salesForecastId"/></not></condition>
<widgets>
- <include-menu
name="SalesForecastTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu
name="SalesForecastTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</widgets>
diff --git a/applications/marketing/widget/sfa/LeadScreens.xml
b/applications/marketing/widget/sfa/LeadScreens.xml
index 623b397614..7dc89e5a2e 100644
--- a/applications/marketing/widget/sfa/LeadScreens.xml
+++ b/applications/marketing/widget/sfa/LeadScreens.xml
@@ -39,11 +39,11 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="LeadSubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="LeadSubTabBar"
location="${parameters.mainMenuLocation}"/>
<container style="no-clear">
<decorator-screen
name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section
name="search-options">
- <include-menu
name="LeadFindTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu
name="LeadFindTabBar" location="${parameters.mainMenuLocation}"/>
<include-form name="FindLeads"
location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
</decorator-section>
<decorator-section
name="search-results">
