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 f5c85d465c Improved: SFA - parameterize PortalPage menus (OFBIZ-12950)
(#735)
f5c85d465c is described below
commit f5c85d465c097ce135bedc9ec7633b24124a0ee8
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Tue Mar 19 13:32:04 2024 +0100
Improved: SFA - parameterize PortalPage menus (OFBIZ-12950) (#735)
* Improved: SFA - parameterize PortalPage menus (OFBIZ-12950)
Menus in PortalPages used in applications need a fix for parameterisation.
modified:
- party: web.xml - added context-param for communicationMenuLocation
- party: CommunicationEventScreens..xml - changed CommunicationMenu location
- workeffort: web.xml - added context-param for calendarMenuLocation
- workeffort: CalendarScreens.xml - channged location of calendar menus
- sfa: web.xml - added context-params for calendarMenuLocation and
communicationMenuLocation
* correcting location of the communnicationMenuLocation
---
applications/marketing/webapp/sfa/WEB-INF/web.xml | 10 ++++++++++
applications/party/webapp/partymgr/WEB-INF/web.xml | 5 +++++
.../party/widget/partymgr/CommunicationEventScreens.xml | 2 +-
applications/workeffort/webapp/workeffort/WEB-INF/web.xml | 5 +++++
applications/workeffort/widget/CalendarScreens.xml | 8 ++++----
5 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/applications/marketing/webapp/sfa/WEB-INF/web.xml
b/applications/marketing/webapp/sfa/WEB-INF/web.xml
index 6ba7146076..bd0a0ad340 100644
--- a/applications/marketing/webapp/sfa/WEB-INF/web.xml
+++ b/applications/marketing/webapp/sfa/WEB-INF/web.xml
@@ -43,6 +43,16 @@ under the License.
<param-name>mainMenuLocation</param-name>
<param-value>component://marketing/widget/sfa/SfaMenus.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the communications menus file to be used
in this webapp; referred to as a context variable in screen def XML
files.</description>
+ <param-name>communicationMenuLocation</param-name>
+
<param-value>component://party/widget/partymgr/PartyMenus.xml</param-value>
+ </context-param>
+ <context-param>
+ <description>The location of the calendar menus file to be used in
this webapp; referred to as a context variable in screen def XML
files.</description>
+ <param-name>calendarMenuLocation</param-name>
+
<param-value>component://workeffort/widget/WorkEffortMenus.xml</param-value>
+ </context-param>
<filter>
<display-name>ControlFilter</display-name>
diff --git a/applications/party/webapp/partymgr/WEB-INF/web.xml
b/applications/party/webapp/partymgr/WEB-INF/web.xml
index 261452302f..83fbfa3d10 100644
--- a/applications/party/webapp/partymgr/WEB-INF/web.xml
+++ b/applications/party/webapp/partymgr/WEB-INF/web.xml
@@ -43,6 +43,11 @@ under the License.
<param-name>mainMenuLocation</param-name>
<param-value>component://party/widget/partymgr/PartyMenus.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the communications menus file to be used
in this webapp; referred to as a context variable in screen def XML
files.</description>
+ <param-name>communicationMenuLocation</param-name>
+
<param-value>component://party/widget/partymgr/PartyMenus.xml</param-value>
+ </context-param>
<filter>
<display-name>ControlFilter</display-name>
diff --git a/applications/party/widget/partymgr/CommunicationEventScreens.xml
b/applications/party/widget/partymgr/CommunicationEventScreens.xml
index 320ecac5b4..d56d22a0b0 100644
--- a/applications/party/widget/partymgr/CommunicationEventScreens.xml
+++ b/applications/party/widget/partymgr/CommunicationEventScreens.xml
@@ -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="${parameters.mainMenuLocation}"/>
+ <include-menu name="CommunicationsMenu"
location="${parameters.communicationMenuLocation}"/>
<section><!-- List my communication events -->
<condition>
<or>
diff --git a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
index eb5108c4c3..31bb189521 100644
--- a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
+++ b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
@@ -45,6 +45,11 @@ under the License.
<param-name>mainMenuLocation</param-name>
<param-value>component://workeffort/widget/WorkEffortMenus.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the calendar menus file to be used in
this webapp; referred to as a context variable in screen def XML
files.</description>
+ <param-name>calendarMenuLocation</param-name>
+
<param-value>component://workeffort/widget/WorkEffortMenus.xml</param-value>
+ </context-param>
<filter>
<display-name>ControlFilter</display-name>
diff --git a/applications/workeffort/widget/CalendarScreens.xml
b/applications/workeffort/widget/CalendarScreens.xml
index a0bbae7abd..eecabcab3a 100644
--- a/applications/workeffort/widget/CalendarScreens.xml
+++ b/applications/workeffort/widget/CalendarScreens.xml
@@ -51,7 +51,7 @@ under the License.
<include-screen name="eventDetail"/>
<container style="bothclear">
<screenlet title="${uiLabelMap.WorkEffortDayView}:
${groovy:org.apache.ofbiz.base.util.UtilDateTime.timeStampToString(start,
"EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day"
padded="false">
- <include-menu name="Day"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="Day"
location="${parameters.calendarMenuLocation}"/>
<platform-specific>
<html><html-template
location="component://workeffort/template/calendar/Day.ftl"/></html>
</platform-specific>
@@ -73,7 +73,7 @@ under the License.
<include-screen name="eventDetail"/>
<container style="bothclear">
<screenlet title="${uiLabelMap.WorkEffortWeekView}:
${uiLabelMap.CommonWeek}
${groovy:org.apache.ofbiz.base.util.UtilDateTime.timeStampToString(start,
"w", timeZone, locale)}" navigation-menu-name="Week" padded="false">
- <include-menu name="Week"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="Week"
location="${parameters.calendarMenuLocation}"/>
<platform-specific>
<html><html-template
location="component://workeffort/template/calendar/Week.ftl"/></html>
</platform-specific>
@@ -92,7 +92,7 @@ under the License.
<include-screen name="eventDetail"/>
<container style="bothclear">
<screenlet title="${uiLabelMap.WorkEffortMonthView}:
${groovy:org.apache.ofbiz.base.util.UtilDateTime.timeStampToString(start,
"MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month"
padded="false">
- <include-menu name="Month"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="Month"
location="${parameters.calendarMenuLocation}"/>
<platform-specific>
<html><html-template
location="component://workeffort/template/calendar/Month.ftl"/></html>
</platform-specific>
@@ -111,7 +111,7 @@ under the License.
<include-screen name="eventDetail"/>
<container style="bothclear">
<screenlet
title="${uiLabelMap.WorkEffortCalendarUpComingEventsView}"
navigation-menu-name="Upcoming">
- <include-menu name="Upcoming"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="Upcoming"
location="${parameters.calendarMenuLocation}"/>
<platform-specific>
<html><html-template
location="component://workeffort/template/calendar/Upcoming.ftl"/></html>
</platform-specific>
