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 a5e3c75abc Improved: SFA - Move from hard-code menu location to
parameterized (OFBIZ-12943) (#775)
a5e3c75abc is described below
commit a5e3c75abcf4e0dd0f7cf99cbcb2ce086c82d648
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Wed Apr 17 16:10:03 2024 +0200
Improved: SFA - Move from hard-code menu location to parameterized
(OFBIZ-12943) (#775)
Move the menu location in the various sfa screens from hardcoded to
parameterized.
modified:
menu location from hard-coded to parameterized in AccountScreens.xml,
CommonScreens.xml, ContactScreens.xml, ForecastScreens.xml, LeadScreens.xml
---
applications/marketing/widget/sfa/AccountScreens.xml | 2 +-
applications/marketing/widget/sfa/CommonScreens.xml | 12 ++++++------
applications/marketing/widget/sfa/ContactScreens.xml | 2 +-
applications/marketing/widget/sfa/ForecastScreens.xml | 4 ++--
applications/marketing/widget/sfa/LeadScreens.xml | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/applications/marketing/widget/sfa/AccountScreens.xml
b/applications/marketing/widget/sfa/AccountScreens.xml
index 62779a8774..c12890e76b 100644
--- a/applications/marketing/widget/sfa/AccountScreens.xml
+++ b/applications/marketing/widget/sfa/AccountScreens.xml
@@ -34,7 +34,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
diff --git a/applications/marketing/widget/sfa/CommonScreens.xml
b/applications/marketing/widget/sfa/CommonScreens.xml
index 599967b446..adfbae8467 100644
--- a/applications/marketing/widget/sfa/CommonScreens.xml
+++ b/applications/marketing/widget/sfa/CommonScreens.xml
@@ -62,7 +62,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="pre-body"/>
</decorator-section>
<decorator-section name="left-column">
@@ -114,7 +114,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<include-menu name="OpportunityTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
@@ -755,7 +755,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<include-menu name="AccountTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
@@ -774,7 +774,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<include-menu name="ContactTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
@@ -801,7 +801,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<include-menu name="LeadTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
@@ -820,7 +820,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<include-menu name="EventTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
diff --git a/applications/marketing/widget/sfa/ContactScreens.xml
b/applications/marketing/widget/sfa/ContactScreens.xml
index 19ae86a3ef..7a3d250c72 100644
--- a/applications/marketing/widget/sfa/ContactScreens.xml
+++ b/applications/marketing/widget/sfa/ContactScreens.xml
@@ -34,7 +34,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="pre-body"/>
</decorator-section>
<decorator-section name="left-column">
diff --git a/applications/marketing/widget/sfa/ForecastScreens.xml
b/applications/marketing/widget/sfa/ForecastScreens.xml
index 6a29876b02..b084e8b5d1 100644
--- a/applications/marketing/widget/sfa/ForecastScreens.xml
+++ b/applications/marketing/widget/sfa/ForecastScreens.xml
@@ -29,7 +29,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"
location="component://marketing/widget/sfa/CommonScreens.xml"/>
@@ -63,7 +63,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="pre-body"/>
</decorator-section>
<decorator-section name="left-column">
diff --git a/applications/marketing/widget/sfa/LeadScreens.xml
b/applications/marketing/widget/sfa/LeadScreens.xml
index 50ff601a92..965abb22e3 100644
--- a/applications/marketing/widget/sfa/LeadScreens.xml
+++ b/applications/marketing/widget/sfa/LeadScreens.xml
@@ -34,7 +34,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="pre-body"/>
</decorator-section>
<decorator-section name="left-column">
