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 da53eb706b Improved: Marketing - Move from hard-code menu location to
parameterized (OFBIZ-12941) (#727)
da53eb706b is described below
commit da53eb706bb60c620a83f5893661b7853b714518
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Fri Mar 15 08:45:11 2024 +0100
Improved: Marketing - Move from hard-code menu location to parameterized
(OFBIZ-12941) (#727)
Move the menu location in the various marketing screens from hardcoded to
parameterized.
modified:
- CommonScreens.xml
- ContactListScreens.xml
- DataSourceScreens.xml
- MarketingCampaignScreens.xml
- MarketingReportScreens.xml
- SegmentScreen.xml
- TrackingCodeScreens.xml
---
applications/marketing/widget/CommonScreens.xml | 8 ++++----
applications/marketing/widget/ContactListScreens.xml | 2 +-
applications/marketing/widget/DataSourceScreens.xml | 2 +-
applications/marketing/widget/MarketingCampaignScreens.xml | 2 +-
applications/marketing/widget/MarketingReportScreens.xml | 2 +-
applications/marketing/widget/SegmentScreens.xml | 4 ++--
applications/marketing/widget/TrackingCodeScreens.xml | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/applications/marketing/widget/CommonScreens.xml
b/applications/marketing/widget/CommonScreens.xml
index 2663dd3436..7859733c80 100644
--- a/applications/marketing/widget/CommonScreens.xml
+++ b/applications/marketing/widget/CommonScreens.xml
@@ -38,7 +38,7 @@ under the License.
<set field="activeApp" value="marketing" global="true"/>
<set field="applicationTitle"
from-field="uiLabelMap.MarketingManagerApplication" global="true"/>
<set field="applicationMenuName" value="MarketingAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://marketing/widget/MarketingMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_marketing"/>
</actions>
<widgets>
@@ -59,7 +59,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -106,7 +106,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<screenlet
title="${uiLabelMap.MarketingManagerApplication}">
@@ -126,7 +126,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="MarketingShortcutAppBar"
location="component://marketing/widget/MarketingMenus.xml"/>
+ <include-menu name="MarketingShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/marketing/widget/ContactListScreens.xml
b/applications/marketing/widget/ContactListScreens.xml
index dce372c0db..d206bfbf06 100644
--- a/applications/marketing/widget/ContactListScreens.xml
+++ b/applications/marketing/widget/ContactListScreens.xml
@@ -35,7 +35,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
diff --git a/applications/marketing/widget/DataSourceScreens.xml
b/applications/marketing/widget/DataSourceScreens.xml
index 4e8ffac019..2439b15d9f 100644
--- a/applications/marketing/widget/DataSourceScreens.xml
+++ b/applications/marketing/widget/DataSourceScreens.xml
@@ -32,7 +32,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<!-- do check for MARKETING, _VIEW permission -->
<condition>
diff --git a/applications/marketing/widget/MarketingCampaignScreens.xml
b/applications/marketing/widget/MarketingCampaignScreens.xml
index 6138d77003..604e48888c 100644
--- a/applications/marketing/widget/MarketingCampaignScreens.xml
+++ b/applications/marketing/widget/MarketingCampaignScreens.xml
@@ -32,7 +32,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<!-- do check for MARKETING, _VIEW permission -->
<condition>
diff --git a/applications/marketing/widget/MarketingReportScreens.xml
b/applications/marketing/widget/MarketingReportScreens.xml
index 04b1bcb5f4..4bea52136b 100644
--- a/applications/marketing/widget/MarketingReportScreens.xml
+++ b/applications/marketing/widget/MarketingReportScreens.xml
@@ -27,7 +27,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
diff --git a/applications/marketing/widget/SegmentScreens.xml
b/applications/marketing/widget/SegmentScreens.xml
index 33e0bc2476..862cee3ba0 100644
--- a/applications/marketing/widget/SegmentScreens.xml
+++ b/applications/marketing/widget/SegmentScreens.xml
@@ -43,7 +43,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu" location="
${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -81,7 +81,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<!-- do check for MARKETING, _VIEW permission -->
<condition>
diff --git a/applications/marketing/widget/TrackingCodeScreens.xml
b/applications/marketing/widget/TrackingCodeScreens.xml
index 6bc1f97996..94b47623f3 100644
--- a/applications/marketing/widget/TrackingCodeScreens.xml
+++ b/applications/marketing/widget/TrackingCodeScreens.xml
@@ -31,7 +31,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://marketing/widget/MarketingMenus.xml"
name="MainActionMenu"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<!-- do check for MARKETING, _VIEW permission -->
<condition>
