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-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new a9d7857c5 Improved:cross-app memu location issues (OFBIZ-13035) (#110)
a9d7857c5 is described below
commit a9d7857c5e1b94b3066debaa6365ee2f1209b115
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Tue Apr 16 17:20:40 2024 +0200
Improved:cross-app memu location issues (OFBIZ-13035) (#110)
* Improved:cross-app memu location issues (OFBIZ-13035)
address cross application menu-location issues.
modified:
in SCRUM: web.xml - add context-param for profileMenuLocation
* Improved:cross-app memu location issues (OFBIZ-13035)
address cross application menu-location issues.
modified:
in PROJECT: web.xml - add context-param for requestMenuLocation
* Improved:cross-app memu location issues (OFBIZ-13035)
address cross application menu-location issues.
modified:
in MYPORTAL: web.xml - add context-param for profiletMenuLocation
* Improved: Fix cross-app menu location issues (FBIZ-13035)
address cross application menu-location issues.
Plugins use the timesheet functionality from the workeffort component.
Given that base approval should be in the workeffort component, duplicate menus
in plugins should reside in workeffort
modified:
- Project/web.xml: added context-param timesheetMenuLocation
- Project/TimeSheetScreens.xml: changed ref and location regarding
timesheet actions
- Scrum/web.xml: added context-param timesheetMenuLocation
---
myportal/webapp/myportal/WEB-INF/web.xml | 5 +++++
projectmgr/webapp/projectmgr/WEB-INF/web.xml | 10 ++++++++++
projectmgr/widget/TimeSheetScreens.xml | 4 ++--
scrum/webapp/scrum/WEB-INF/web.xml | 10 ++++++++++
4 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/myportal/webapp/myportal/WEB-INF/web.xml
b/myportal/webapp/myportal/WEB-INF/web.xml
index 6eb1b4b64..d4d28eb89 100644
--- a/myportal/webapp/myportal/WEB-INF/web.xml
+++ b/myportal/webapp/myportal/WEB-INF/web.xml
@@ -53,6 +53,11 @@
<param-name>communicationMenuLocation</param-name>
<param-value>component://party/widget/partymgr/PartyMenus.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the profile screen menus file to be used
in this webapp; referred to as a context variable in screen def XML
files.</description>
+ <param-name>profileMenuLocation</param-name>
+
<param-value>component://party/widget/partymgr/PartyMenus.xml</param-value>
+ </context-param>
<context-param>
<description>The location of the request menus file to be used in this
webapp; referred to as a context variable in screen def XML files.</description>
<param-name>requestMenuLocation</param-name>
diff --git a/projectmgr/webapp/projectmgr/WEB-INF/web.xml
b/projectmgr/webapp/projectmgr/WEB-INF/web.xml
index 274afc9fd..bad9d48fc 100644
--- a/projectmgr/webapp/projectmgr/WEB-INF/web.xml
+++ b/projectmgr/webapp/projectmgr/WEB-INF/web.xml
@@ -42,6 +42,16 @@
<param-name>mainMenuLocation</param-name>
<param-value>component://projectmgr/widget/ProjectMenus.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the request menus file to be used in this
webapp; referred to as a context variable in screen def XML files.</description>
+ <param-name>requestMenuLocation</param-name>
+
<param-value>component://order/widget/ordermgr/OrderMenus.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>timesheetMenuLocation</param-name>
+
<param-value>component://workeffort/widget/WorkEffortMenus.xml</param-value>
+ </context-param>
<filter>
<display-name>ControlFilter</display-name>
diff --git a/projectmgr/widget/TimeSheetScreens.xml
b/projectmgr/widget/TimeSheetScreens.xml
index 39485b205..c474f2abc 100644
--- a/projectmgr/widget/TimeSheetScreens.xml
+++ b/projectmgr/widget/TimeSheetScreens.xml
@@ -231,8 +231,8 @@ under the License.
</widgets>
<fail-widgets>
<screenlet
title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr}
${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber}
${uiLabelMap.CommonFrom}
${groovy:timesheet.get("fromDate").toString().substring(0,10)}
${uiLabelMap.CommonTo}
${groovy:timesheet.get("thruDate").toString().substring(0,10)}"
- navigation-menu-name="TimesheetBar">
- <include-menu name="TimesheetBar"
location="${parameters.mainMenuLocation}"/>
+ navigation-menu-name="TimesheetActionMenu">
+ <include-menu name="TimesheetActionMenu"
location="${parameters.timesheetMenuLocation}"/>
<include-form name="EditWeekTimesheet"
location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
</screenlet>
</fail-widgets>
diff --git a/scrum/webapp/scrum/WEB-INF/web.xml
b/scrum/webapp/scrum/WEB-INF/web.xml
index 09384e9f8..a77183567 100644
--- a/scrum/webapp/scrum/WEB-INF/web.xml
+++ b/scrum/webapp/scrum/WEB-INF/web.xml
@@ -39,6 +39,16 @@ under the License.
<param-name>mainMenuLocation</param-name>
<param-value>component://scrum/widget/scrumMenus.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the profile screen menus file to be used
in this webapp; referred to as a context variable in screen def XML
files.</description>
+ <param-name>profileMenuLocation</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>timesheetMenuLocation</param-name>
+
<param-value>component://workeffort/widget/WorkEffortMenus.xml</param-value>
+ </context-param>
<filter>
<display-name>ControlFilter</display-name>
