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 6039526c74 Fixed: Trunk demo errors in error log (OFBIZ-13005) (#748)
6039526c74 is described below
commit 6039526c744e1a75e5c40b553de964041f386531
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Tue Apr 9 10:27:08 2024 +0200
Fixed: Trunk demo errors in error log (OFBIZ-13005) (#748)
* Improved: ORDER - have requestMenuLocation (OFBIZ-12991)
Given that request screens are used as portal pages, the inclusion of such
portal pages in other applications leads to errors being thrown for the
associated menus (due to the use of the mainMenuLocation parameter in web.xml).
Having a requestMenuLocation in web.xml solves this issue.
modified:
- web.xml: add contextParam requestMenuLocation
- CommonScreens.xml: change location request related menus
- CustRequestScreens.xml: change location request related menu
* Fixed: Trunk demo errors in error.log
modified:
EmployeeScreens.xml - removed form reference to grid
ListEmployeeQualification
* Fixed: Trunk demo errors in error.log (OFBIZ-13005)
modified: EventForms.xml - MyTaks: extending a grid
---
applications/humanres/widget/EmployeeScreens.xml | 1 -
applications/marketing/widget/sfa/forms/EventForms.xml | 4 ++--
applications/order/webapp/ordermgr/WEB-INF/web.xml | 5 +++++
applications/order/widget/ordermgr/CommonScreens.xml | 4 ++--
applications/order/widget/ordermgr/CustRequestScreens.xml | 2 +-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/applications/humanres/widget/EmployeeScreens.xml
b/applications/humanres/widget/EmployeeScreens.xml
index 3ede570426..c7133b977d 100644
--- a/applications/humanres/widget/EmployeeScreens.xml
+++ b/applications/humanres/widget/EmployeeScreens.xml
@@ -203,7 +203,6 @@ under the License.
<screenlet>
<include-grid name="ListEmployeeQualification"
location="component://humanres/widget/forms/EmployeeForms.xml"/>
</screenlet>
- <include-form name="ListEmployeeQualification"
location="component://humanres/widget/forms/EmployeeForms.xml"/>
<screenlet id="AddPartyQualPanel"
title="${uiLabelMap.HumanResAddPartyQual}" collapsible="true">
<include-form name="AddEmployeeQualification"
location="component://humanres/widget/forms/EmployeeForms.xml"/>
</screenlet>
diff --git a/applications/marketing/widget/sfa/forms/EventForms.xml
b/applications/marketing/widget/sfa/forms/EventForms.xml
index 2e2e188860..f5293f1e5a 100644
--- a/applications/marketing/widget/sfa/forms/EventForms.xml
+++ b/applications/marketing/widget/sfa/forms/EventForms.xml
@@ -20,7 +20,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Form";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form
http://ofbiz.apache.org/dtds/widget-form.xsd";>
- <form name="MyTasks" list-name="myTasks" extends="ListWorkEfforts"
extends-resource="component://workeffort/widget/WorkEffortForms.xml">
+ <grid name="MyTasks" list-name="myTasks" extends="ListWorkEfforts"
extends-resource="component://workeffort/widget/WorkEffortForms.xml">
<row-actions>
<entity-one entity-name="UserLogin"
value-field="assignedByUserLogin">
<field-map field-name="userLoginId"
from-field="assignedByUserLoginId"/>
@@ -48,7 +48,7 @@ under the License.
<parameter param-name="currentStatusId" value="CAL_COMPLETED"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="TasksAssignedByMe" list-name="tasksAssignedByMe"
extends="MyTasks">
<field name="assignedByUserLoginId"><hidden/></field>
<field name="partyId" title="${uiLabelMap.FormFieldTitle_toPartyId}">
diff --git a/applications/order/webapp/ordermgr/WEB-INF/web.xml
b/applications/order/webapp/ordermgr/WEB-INF/web.xml
index ee2e629fd3..8f1b63932c 100644
--- a/applications/order/webapp/ordermgr/WEB-INF/web.xml
+++ b/applications/order/webapp/ordermgr/WEB-INF/web.xml
@@ -43,6 +43,11 @@ under the License.
<param-name>mainMenuLocation</param-name>
<param-value>component://order/widget/ordermgr/OrderMenus.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>
<filter>
<display-name>ControlFilter</display-name>
diff --git a/applications/order/widget/ordermgr/CommonScreens.xml
b/applications/order/widget/ordermgr/CommonScreens.xml
index 80e379525c..bddb6def82 100644
--- a/applications/order/widget/ordermgr/CommonScreens.xml
+++ b/applications/order/widget/ordermgr/CommonScreens.xml
@@ -69,12 +69,12 @@ under the License.
<not><if-empty field="custRequest"/></not>
</condition>
<widgets>
- <include-menu name="RequestTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="RequestTabBar"
location="${parameters.requestMenuLocation}"/>
</widgets>
</section>
</decorator-section>
<decorator-section name="body">
- <include-menu name="RequestSubTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="RequestSubTabBar"
location="${parameters.requestMenuLocation}"/>
<container>
<section>
<condition>
diff --git a/applications/order/widget/ordermgr/CustRequestScreens.xml
b/applications/order/widget/ordermgr/CustRequestScreens.xml
index aa429ee573..8dba9ff0d1 100644
--- a/applications/order/widget/ordermgr/CustRequestScreens.xml
+++ b/applications/order/widget/ordermgr/CustRequestScreens.xml
@@ -570,7 +570,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.OrderIncomingCustRequests}"
navigation-menu-name="RequestScreenletMenu">
- <include-menu name="RequestScreenletMenu"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="RequestScreenletMenu"
location="${parameters.requestMenuLocation}"/>
<include-form name="ListRequestList"
location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</widgets>
