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 714874fcdf Improved: HumanRes - Move from hard-code menu location to
parameterized (OFBIZ-12922) (#718)
714874fcdf is described below
commit 714874fcdf6b7191fbc64007bfd81e2f70707bba
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Mon Mar 4 09:37:50 2024 +0100
Improved: HumanRes - Move from hard-code menu location to parameterized
(OFBIZ-12922) (#718)
* Improved: Have library dependencies moved to a dependencies.gradle file
(OFBIZ-10924)
Currently the libraries needed by ofbiz are defined in the build.gradle
file. These should reside in a separate dependencies.gradle file that is
referenced in the build.gradle file, like the common.gradle. As is common
practice in other projects/solutions that work with dependencies on external
libraries.
modified:
build.gradle: removed implementation, testImplementation and runtimeOnly
library dependencies added:
dependencies.gradle, having the implementation, testImplementation and
runtimeOnly library dependencies
* adding 'apply from' regarding dependencies
* Improved: HumanRes - Move from hard-code menu location to parameterized
(OFBIZ-12922)
Customization is a key aspect of the OFBiz (Open For Business) platform,
providing businesses with a robust and adaptable base to customize their
enterprise software solutions according to their unique operational
requirements.
The *Menus.xml file of a component, essential for designing user interfaces
that are both intuitive and tailored to the specific roles and tasks of its
users, plays a significant role in this context, as referenced within screen
widgets and Freemarker templates.
However, as customizations and the project's source code evolve over time,
the likelihood of encountering merge conflicts increases significantly,
especially when attempting to incorporate customizations alongside ongoing bug
fixes and enhancements from the project.
To improve the appeal of OFbiz and the developer experience, it is
recommended to shift from fixed menu locations to a parameterized approach in
our components and plugins. This change would enable developers to more
seamlessly incorporate a 'custom' menu, facilitating the integration of project
updates.
modified:
humanres/WEB-INF/web.xml: added parameter for mainMenuLocation
various *Screens.xml files: changing location of 'include-menu' elements
from location="component://humanres/widget/HumanresMenus.xml to
location="${parameters.mainMenuLocation}"
---
.../humanres/webapp/humanres/WEB-INF/web.xml | 5 +++
applications/humanres/widget/CommonScreens.xml | 40 +++++++++++-----------
applications/humanres/widget/EmplLeaveScreens.xml | 10 +++---
.../humanres/widget/EmplPositionScreens.xml | 4 +--
applications/humanres/widget/EmployeeScreens.xml | 2 +-
applications/humanres/widget/EmploymentScreens.xml | 2 +-
.../humanres/widget/GlobalHRSettingScreens.xml | 8 ++---
applications/humanres/widget/PartyQualScreens.xml | 2 +-
.../humanres/widget/PartyResumeScreens.xml | 2 +-
applications/humanres/widget/PartySkillScreens.xml | 2 +-
applications/humanres/widget/PayGradeScreens.xml | 4 +--
applications/humanres/widget/PerfReviewScreens.xml | 2 +-
.../humanres/widget/RecruitmentScreens.xml | 14 ++++----
13 files changed, 51 insertions(+), 46 deletions(-)
diff --git a/applications/humanres/webapp/humanres/WEB-INF/web.xml
b/applications/humanres/webapp/humanres/WEB-INF/web.xml
index d837049780..b93895f1d1 100644
--- a/applications/humanres/webapp/humanres/WEB-INF/web.xml
+++ b/applications/humanres/webapp/humanres/WEB-INF/web.xml
@@ -38,6 +38,11 @@ under the License.
<param-name>mainDecoratorLocation</param-name>
<param-value>component://humanres/widget/CommonScreens.xml</param-value>
</context-param>
+ <context-param>
+ <description>The location of the menus file to be used in this webapp;
referred to as a context variable in screen def XML files.</description>
+ <param-name>mainMenuLocation</param-name>
+
<param-value>component://humanres/widget/HumanresMenus.xml</param-value>
+ </context-param>
<filter>
<display-name>ControlFilter</display-name>
diff --git a/applications/humanres/widget/CommonScreens.xml
b/applications/humanres/widget/CommonScreens.xml
index 9734bb7545..9ce37501d4 100644
--- a/applications/humanres/widget/CommonScreens.xml
+++ b/applications/humanres/widget/CommonScreens.xml
@@ -40,7 +40,7 @@ under the License.
<set field="layoutSettings.styleSheets[]"
value="/images/humanres/humanres.css" global="true"/>
<set field="layoutSettings.javaScripts[+0]"
value="/common/js/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/>
<set field="applicationMenuName" value="HumanResAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://humanres/widget/HumanresMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="applicationTitle"
from-field="uiLabelMap.HumanResManagerApplication" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_human_resources"/>
</actions>
@@ -55,7 +55,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -82,7 +82,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="HumanResShortcutAppBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="HumanResShortcutAppBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -131,7 +131,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -140,7 +140,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="EmplPostionBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplPostionBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -175,7 +175,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -202,7 +202,7 @@ under the License.
<not><if-empty
field="parameters.fromDate"/></not>
</condition>
<widgets>
- <include-menu
name="EmploymentBar" location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu
name="EmploymentBar" location="${parameters.mainMenuLocation}"/>
<label style="h1"
text="${emplName.lastName},${emplName.firstName} ${emplName.middleName}
[${emplName.partyId}] ${uiLabelMap.CommonFor}"></label>
<label style="h1"
text="${orgName.groupName} [${orgName.partyId}]"></label>
</widgets>
@@ -229,7 +229,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -247,7 +247,7 @@ under the License.
</entity-one>
</actions>
<widgets>
- <include-menu name="PerfReviewBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="PerfReviewBar"
location="${parameters.mainMenuLocation}"/>
<label style="h1"
text="${uiLabelMap.HumanResPerfReview} [${perfReview.perfReviewId}]
${partyNameView.lastName} ${partyNameView.firstName}
${partyNameView.middleName}"></label>
</widgets>
</section>
@@ -274,7 +274,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -283,7 +283,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="EmployeeProfileTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmployeeProfileTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -339,7 +339,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="EmployeeProfileTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmployeeProfileTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
@@ -390,8 +390,8 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
- <include-menu name="GlobalHRSettingMenus"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="GlobalHRSettingMenus"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<decorator-section-include name="body"/>
@@ -409,8 +409,8 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
- <include-menu name="RecruitmentTypeMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="RecruitmentTypeMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<decorator-section-include name="body"/>
@@ -428,8 +428,8 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
- <include-menu name="TrainingTypeMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="TrainingTypeMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<decorator-section-include name="body"/>
@@ -446,8 +446,8 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
- <include-menu name="EmployeeProfileTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="EmployeeProfileTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
diff --git a/applications/humanres/widget/EmplLeaveScreens.xml
b/applications/humanres/widget/EmplLeaveScreens.xml
index 8222ce352d..c9ae7a94a6 100644
--- a/applications/humanres/widget/EmplLeaveScreens.xml
+++ b/applications/humanres/widget/EmplLeaveScreens.xml
@@ -43,8 +43,8 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
- <include-menu name="EmplLeaveTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="EmplLeaveTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -96,7 +96,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="EmplLeaveTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplLeaveTabBar"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -149,7 +149,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplLeaveTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplLeaveTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet id="AddEmplLeavePanel"
title="${uiLabelMap.HumanResAddEmplLeave}" collapsible="true">
<include-form name="EditEmplLeave"
location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
</screenlet>
@@ -175,7 +175,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplLeaveTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplLeaveTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet id="EditEmplLeaveStatus"
title="${uiLabelMap.HumanResEditLeaveApprovalStatus}" collapsible="true">
<include-form name="EditEmplLeaveStatus"
location="component://humanres/widget/forms/EmplLeaveForms.xml"/>
</screenlet>
diff --git a/applications/humanres/widget/EmplPositionScreens.xml
b/applications/humanres/widget/EmplPositionScreens.xml
index 55341c567a..de9ab43946 100644
--- a/applications/humanres/widget/EmplPositionScreens.xml
+++ b/applications/humanres/widget/EmplPositionScreens.xml
@@ -157,7 +157,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplPositionTypeTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplPositionTypeTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet
title="${uiLabelMap.HumanResListValidResponsibility}">
<container>
<link target="EditValidResponsibility"
text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext">
@@ -183,7 +183,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplPositionTypeTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplPositionTypeTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet
title="${uiLabelMap.HumanResAddValidResponsibility}">
<container>
<link target="EditValidResponsibility"
text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext">
diff --git a/applications/humanres/widget/EmployeeScreens.xml
b/applications/humanres/widget/EmployeeScreens.xml
index 83e6c26b13..3ede570426 100644
--- a/applications/humanres/widget/EmployeeScreens.xml
+++ b/applications/humanres/widget/EmployeeScreens.xml
@@ -30,7 +30,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="MainActionMenu"
location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
diff --git a/applications/humanres/widget/EmploymentScreens.xml
b/applications/humanres/widget/EmploymentScreens.xml
index a84667d92d..2501661adf 100644
--- a/applications/humanres/widget/EmploymentScreens.xml
+++ b/applications/humanres/widget/EmploymentScreens.xml
@@ -36,7 +36,7 @@
<widgets>
<decorator-screen name="CommonEmploymentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <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/humanres/widget/GlobalHRSettingScreens.xml
b/applications/humanres/widget/GlobalHRSettingScreens.xml
index 62c09f465b..0caf5e589c 100644
--- a/applications/humanres/widget/GlobalHRSettingScreens.xml
+++ b/applications/humanres/widget/GlobalHRSettingScreens.xml
@@ -130,7 +130,7 @@
</not>
</condition>
<widgets>
- <include-menu name="EmplPositionTypeTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplPositionTypeTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<screenlet
title="${uiLabelMap.HumanResEditEmplPositionType}">
@@ -158,7 +158,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplPositionTypeTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplPositionTypeTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet id="AddEmplPositionTypeRatePanel"
title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType}
${uiLabelMap.CommonRate}" collapsible="true">
<include-form name="AddEmplPositionTypeRate"
location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</screenlet>
@@ -238,7 +238,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplLeaveReasonTypeTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplLeaveReasonTypeTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet id="AddEmplLeaveTypePanel"
title="${uiLabelMap.HumanResAddEmplLeaveType}" collapsible="true">
<include-form name="AddEmplLeaveType"
location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</screenlet>
@@ -260,7 +260,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplLeaveReasonTypeTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplLeaveReasonTypeTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet id="AddEmplReasonTypePanel"
title="${uiLabelMap.HumanResAddEmplLeaveReasonType}" collapsible="true">
<include-form name="AddEmplLeaveReasonType"
location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</screenlet>
diff --git a/applications/humanres/widget/PartyQualScreens.xml
b/applications/humanres/widget/PartyQualScreens.xml
index 526323c510..5f93bcd90c 100644
--- a/applications/humanres/widget/PartyQualScreens.xml
+++ b/applications/humanres/widget/PartyQualScreens.xml
@@ -38,7 +38,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <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/humanres/widget/PartyResumeScreens.xml
b/applications/humanres/widget/PartyResumeScreens.xml
index ba6735ff66..66a2f54bfe 100644
--- a/applications/humanres/widget/PartyResumeScreens.xml
+++ b/applications/humanres/widget/PartyResumeScreens.xml
@@ -31,7 +31,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <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/humanres/widget/PartySkillScreens.xml
b/applications/humanres/widget/PartySkillScreens.xml
index d099da2210..d736b618d7 100644
--- a/applications/humanres/widget/PartySkillScreens.xml
+++ b/applications/humanres/widget/PartySkillScreens.xml
@@ -31,7 +31,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <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/humanres/widget/PayGradeScreens.xml
b/applications/humanres/widget/PayGradeScreens.xml
index b4be28bb7e..d86afa9ce8 100644
--- a/applications/humanres/widget/PayGradeScreens.xml
+++ b/applications/humanres/widget/PayGradeScreens.xml
@@ -71,7 +71,7 @@
<not><if-empty
field="parameters.payGradeId"/></not>
</condition>
<widgets>
- <include-menu name="SalaryBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="SalaryBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<screenlet title="${uiLabelMap.HumanResEditPayGrade}
[${payGradeId}]">
@@ -103,7 +103,7 @@
<not><if-empty
field="parameters.payGradeId"/></not>
</condition>
<widgets>
- <include-menu name="SalaryBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="SalaryBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<screenlet id="AddSalaryStepPanel"
title="${uiLabelMap.HumanResAddSalaryStep} [${payGradeId}]" collapsible="true">
diff --git a/applications/humanres/widget/PerfReviewScreens.xml
b/applications/humanres/widget/PerfReviewScreens.xml
index 05786889ea..643d6ee358 100644
--- a/applications/humanres/widget/PerfReviewScreens.xml
+++ b/applications/humanres/widget/PerfReviewScreens.xml
@@ -33,7 +33,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="MainActionMenu"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <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/humanres/widget/RecruitmentScreens.xml
b/applications/humanres/widget/RecruitmentScreens.xml
index 2452265bf2..846dd65059 100644
--- a/applications/humanres/widget/RecruitmentScreens.xml
+++ b/applications/humanres/widget/RecruitmentScreens.xml
@@ -104,7 +104,7 @@ under the License.
<widgets>
<decorator-screen name="CommonRecruitmentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InternalJobPostingTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="InternalJobPostingTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<if-has-permission permission="HUMANRES"
action="_VIEW"/>
@@ -149,7 +149,7 @@ under the License.
<widgets>
<decorator-screen name="CommonRecruitmentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InternalJobPostingTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="InternalJobPostingTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet id="EditInternalJobPosting"
title="${uiLabelMap.HumanResNewInternalJobPosting}" collapsible="true">
<include-form name="EditInternalJobPosting"
location="component://humanres/widget/forms/RecruitmentForms.xml"/>
</screenlet>
@@ -167,7 +167,7 @@ under the License.
<widgets>
<decorator-screen name="CommonRecruitmentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InternalJobPostingTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="InternalJobPostingTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<if-has-permission permission="HUMANRES"
action="_VIEW"/>
@@ -211,7 +211,7 @@ under the License.
<widgets>
<decorator-screen name="CommonRecruitmentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InternalJobPostingTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="InternalJobPostingTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<widgets>
<screenlet
title="${uiLabelMap.HumanResEditJobInterview}">
@@ -238,7 +238,7 @@ under the License.
<widgets>
<decorator-screen name="CommonRecruitmentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InternalJobPostingTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="InternalJobPostingTabBar"
location=" ${parameters.mainMenuLocation}"/>
<section>
<condition>
<if-has-permission permission="HUMANRES"
action="_VIEW"/>
@@ -273,7 +273,7 @@ under the License.
<widgets>
<decorator-screen name="CommonRecruitmentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InternalJobPostingTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="InternalJobPostingTabBar"
location="${parameters.mainMenuLocation}"/>
<screenlet id="EditApprovalStatus"
title="${uiLabelMap.HumanResEditApprovalStatus}" collapsible="true">
<include-form name="EditApprovalStatus"
location="component://humanres/widget/forms/RecruitmentForms.xml"/>
</screenlet>
@@ -291,7 +291,7 @@ under the License.
<widgets>
<decorator-screen name="CommonRecruitmentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="InternalJobPostingTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="InternalJobPostingTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<if-has-permission permission="HUMANRES"
action="_VIEW"/>
