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 af819d7e8 Improved: SCRUM- Move from hard-coded menu location to
parameterized (OFBIZ-12977) (#108)
af819d7e8 is described below
commit af819d7e8c1463fcc5debd04ed4dadcb39746258
Author: Pierre Smits <[email protected]>
AuthorDate: Sat Apr 13 12:23:26 2024 +0200
Improved: SCRUM- Move from hard-coded menu location to parameterized
(OFBIZ-12977) (#108)
Move the various menu locations in scrum screens to parameterized.
modified: CommonScreens.xml, MyWorkScreens.xml, scrumScreens.xml
changed location of various menus from hardcoded to parameterized
---
scrum/widget/CommonScreens.xml | 36 +++++++++++++++++-----------------
scrum/widget/MyWorkScreens.xml | 2 +-
scrum/widget/scrumScreens.xml | 44 +++++++++++++++++++++---------------------
3 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/scrum/widget/CommonScreens.xml b/scrum/widget/CommonScreens.xml
index 80d959c6b..614606e34 100644
--- a/scrum/widget/CommonScreens.xml
+++ b/scrum/widget/CommonScreens.xml
@@ -35,7 +35,7 @@ under the License.
<set field="activeApp" value="scrum" global="true"/>
<set field="applicationMenuName" value="ScrumAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://scrum/widget/scrumMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="applicationTitle"
from-field="uiLabelMap.ScrumApplication" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_the_scrum_component"/>
</actions>
@@ -84,7 +84,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="ProjectMenu"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProjectMenu"
location="${parameters.mainMenuLocation}"/>
<container style="clear"/>
<label style="h1"
text="${uiLabelMap.ScrumProjectCurrent}:
${project.workEffortName}[${project.workEffortId}]"/>
<decorator-section-include name="body"/>
@@ -118,13 +118,13 @@ under the License.
<not><if-empty field="task"/></not>
</condition>
<widgets>
- <include-menu name="TaskTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="TaskTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<if-service-permission
service-name="scrumPermissionCheck" main-action="UPDATE"
resource-description="TASK"/>
</condition>
<widgets>
- <include-menu
name="TaskSubTabBar" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="TaskSubTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<container style="clear"/>
@@ -182,7 +182,7 @@ under the License.
<if-service-permission
service-name="scrumPermissionCheck" main-action="VIEW"
resource-description="SCRUM"/>
</condition>
<widgets>
- <include-menu name="ProductTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProductTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -191,7 +191,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="ProductSubTabBar"
location="component://scrum/widget/scrumMenus.xml" />
+ <include-menu name="ProductSubTabBar"
location="${parameters.mainMenuLocation}" />
<label style="h1" text="Product:
${product.internalName}[${product.productId}]"/>
</widgets>
</section>
@@ -229,8 +229,8 @@ under the License.
</or>
</condition>
<widgets>
- <include-menu name="ProductBackLogItemTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
- <include-menu
name="ProductBackLogItemStatusTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProductBackLogItemTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu
name="ProductBackLogItemStatusTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -241,7 +241,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="ProductSubTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProductSubTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<section>
@@ -297,8 +297,8 @@ under the License.
</or>
</condition>
<widgets>
- <include-menu name="ProductBackLogItemTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
- <include-menu name="ProductBacklogEmailTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProductBackLogItemTabBar"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="ProductBacklogEmailTabBar"
location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<and>
@@ -309,7 +309,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu name="ProductSubTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProductSubTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<section>
@@ -386,7 +386,7 @@ under the License.
<section>
<condition><not><if-empty
field="partyId"/></not></condition>
<widgets>
- <include-menu name="ResourceTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ResourceTabBar"
location="${parameters.mainMenuLocation}"/>
<container>
<section>
<widgets>
@@ -432,10 +432,10 @@ under the License.
<not><if-empty
field="workEffort"/></not>
</condition>
<widgets>
- <include-menu name="ProjectMenu"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProjectMenu"
location="${parameters.mainMenuLocation}"/>
<section>
<widgets>
- <include-menu
name="ProjectSubTabBar" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="ProjectSubTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<container style="clear"/>
@@ -531,8 +531,8 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="SprintMenu"
location="component://scrum/widget/scrumMenus.xml"/>
- <include-menu name="SprintSubMenu"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="SprintMenu"
location="${parameters.mainMenuLocation}"/>
+ <include-menu name="SprintSubMenu"
location="${parameters.mainMenuLocation}"/>
<label text="Current Sprint: ${sprint.workEffortName}
[${sprint.workEffortId}]" style="h1"/>
<decorator-section-include name="body"/>
</decorator-section>
@@ -553,7 +553,7 @@ under the License.
<if-service-permission
service-name="scrumPermissionCheck" main-action="CREATE"
resource-description="MEMBER"/>
</condition>
<widgets>
- <include-menu name="ScrumAdminSubMenu"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ScrumAdminSubMenu"
location="${parameters.mainMenuLocation}"/>
</widgets>
<fail-widgets>
<label
style="h3">${uiLabelMap.ScrumViewPermissionError}</label>
diff --git a/scrum/widget/MyWorkScreens.xml b/scrum/widget/MyWorkScreens.xml
index bfc8d515c..08ca56ed7 100644
--- a/scrum/widget/MyWorkScreens.xml
+++ b/scrum/widget/MyWorkScreens.xml
@@ -128,7 +128,7 @@ under the License.
<fail-widgets>
<screenlet
title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr}
${timesheet.timesheetId} ${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="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="TimesheetBar"
location="${parameters.mainMenuLocation}"/>
<include-form name="EditWeekTimesheet"
location="component://scrum/widget/MyWorkForms.xml"/>
</screenlet>
</fail-widgets>
diff --git a/scrum/widget/scrumScreens.xml b/scrum/widget/scrumScreens.xml
index 2ff3e91bf..a551c4cb8 100644
--- a/scrum/widget/scrumScreens.xml
+++ b/scrum/widget/scrumScreens.xml
@@ -172,13 +172,13 @@ under the License.
</condition>
<widgets>
<screenlet
id="sprintBacklogListItems" title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="AllBacklogItem" collapsible="true">
- <include-menu
name="AllBacklogItem" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="AllBacklogItem" location="${parameters.mainMenuLocation}"/>
<include-form
name="ViewSprintBacklogListItemsNoAction"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet
id="sprintBacklogListItemsOnFail" title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="NotCompleteBacklogItem" collapsible="true">
- <include-menu
name="NotCompleteBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="NotCompleteBacklogItem" location="${parameters.mainMenuLocation}"/>
<include-form
name="ViewSprintBacklogListItemsNoAction"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</fail-widgets>
@@ -201,13 +201,13 @@ under the License.
</condition>
<widgets>
<screenlet
id="sprintBacklogListItems" title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="AllBacklogItem" collapsible="true">
- <include-menu
name="AllBacklogItem" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="AllBacklogItem" location="${parameters.mainMenuLocation}"/>
<include-form
name="SprintBacklogListItems"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet
id="sprintBacklogListItemsOnFail" title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="NotCompleteBacklogItem" collapsible="true">
- <include-menu
name="NotCompleteBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="NotCompleteBacklogItem" location="${parameters.mainMenuLocation}"/>
<include-form
name="SprintBacklogListItems"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</fail-widgets>
@@ -237,13 +237,13 @@ under the License.
</condition>
<widgets>
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="AllBacklogItem">
-
<include-menu name="AllBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+
<include-menu name="AllBacklogItem" location="${parameters.mainMenuLocation}"/>
<include-form name="SprintBacklogListItemsHideDelete"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="NotCompleteBacklogItem">
-
<include-menu name="NotCompleteBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+
<include-menu name="NotCompleteBacklogItem"
location="${parameters.mainMenuLocation}"/>
<include-form name="SprintBacklogListItemsHideDelete"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</fail-widgets>
@@ -268,13 +268,13 @@ under the License.
</condition>
<widgets>
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="AllBacklogItem">
-
<include-menu name="AllBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+
<include-menu name="AllBacklogItem" location="${parameters.mainMenuLocation}"/>
<include-form name="ViewSprintBacklogListItemsNoAction"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="NotCompleteBacklogItem">
-
<include-menu name="NotCompleteBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+
<include-menu name="NotCompleteBacklogItem"
location="${parameters.mainMenuLocation}"/>
<include-form name="ViewSprintBacklogListItemsNoAction"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</fail-widgets>
@@ -545,7 +545,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.ScrumUnplannedBacklogItemList}"
navigation-menu-name="UnplannedBacklogListOption" id="productBacklogItemList"
collapsible="true" initially-collapsed="true">
- <include-menu
name="UnplannedBacklogListOption"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="UnplannedBacklogListOption" location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<not><if-empty field="checkOwnerList"/></not>
@@ -561,7 +561,7 @@ under the License.
</widgets>
<fail-widgets>
<screenlet
title="${uiLabelMap.ScrumUnplannedBacklogItemList}"
navigation-menu-name="UnplannedBacklogListOption" id="productBacklogItemList"
collapsible="true" initially-collapsed="true">
- <include-menu
name="UnplannedBacklogListOption"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="UnplannedBacklogListOption" location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<not><if-empty field="checkOwnerList"/></not>
@@ -586,7 +586,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.ScrumProductBacklogItemList}"
navigation-menu-name="BacklogListOption" id="productBacklogItemList">
- <include-menu
name="BacklogListOption" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="BacklogListOption" location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<not><if-empty
field="checkOwnerList"/></not>
@@ -602,7 +602,7 @@ under the License.
</widgets>
<fail-widgets>
<screenlet
title="${uiLabelMap.ScrumProductBacklogItemList}"
navigation-menu-name="BacklogListOption" id="productBacklogItemList">
- <include-menu
name="BacklogListOption" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="BacklogListOption" location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<not><if-empty
field="checkOwnerList"/></not>
@@ -626,7 +626,7 @@ under the License.
</condition>
<widgets>
<screenlet
title="${uiLabelMap.ScrumProductBacklogItemList}"
navigation-menu-name="BacklogListOption" id="productBacklogItemList">
- <include-menu
name="BacklogListOption" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="BacklogListOption" location="${parameters.mainMenuLocation}"/>
<section>
<condition>
<if-compare
field="sequence" operator="equals" value="Y"/>
@@ -1579,7 +1579,7 @@ under the License.
<if-has-permission
permission="SCRUM" action="_ADMIN"/>
</condition>
<widgets>
- <include-menu name="ProductSubTabBar"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProductSubTabBar"
location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<screenlet id="findProduct"
title="${uiLabelMap.ScrumFindProduct}" collapsible="true">
@@ -1818,7 +1818,7 @@ under the License.
</actions>
<widgets>
<screenlet id="Backlogs"
title="${uiLabelMap.ScrumProductBacklogItemList}"
navigation-menu-name="BacklogListOption" collapsible="true">
- <include-menu name="BacklogListOption"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="BacklogListOption"
location="${parameters.mainMenuLocation}"/>
<include-form name="ViewTotalProdBacklog"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</widgets>
@@ -1933,7 +1933,7 @@ under the License.
</widgets>
<fail-widgets>
<screenlet
title="${uiLabelMap.ScrumUpdateProject}">
- <include-menu name="ProjectMenu"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu name="ProjectMenu"
location="${parameters.mainMenuLocation}"/>
<include-form
name="EditScrumProject" location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</fail-widgets>
@@ -2893,13 +2893,13 @@ under the License.
</condition>
<widgets>
<screenlet
id="unplanBacklogListItems" title="${uiLabelMap.ScrumUnplanBacklogList}"
navigation-menu-name="AllUnplanBacklogItem" collapsible="true">
- <include-menu
name="AllUnplanBacklogItem" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="AllUnplanBacklogItem" location="${parameters.mainMenuLocation}"/>
<include-form
name="UnplanBacklogListItems"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet
id="unplanBacklogListItemsOnFail" title="${uiLabelMap.ScrumUnplanBacklogList}"
navigation-menu-name="notCompleteUnplanBacklogItem" collapsible="true">
- <include-menu
name="notCompleteUnplanBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu
name="notCompleteUnplanBacklogItem" location="${parameters.mainMenuLocation}"/>
<include-form
name="UnplanBacklogListItems"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</fail-widgets>
@@ -2920,13 +2920,13 @@ under the License.
</condition>
<widgets>
<screenlet
id="unplanBacklogListItemsHideDelete"
title="${uiLabelMap.ScrumUnplanBacklogList}"
navigation-menu-name="AllUnplanBacklogItem">
-
<include-menu name="AllUnplanBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+
<include-menu name="AllUnplanBacklogItem"
location="${parameters.mainMenuLocation}"/>
<include-form name="UnplanBacklogListItemsForOwner"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet
id="unplanBacklogListItemsHideDeleteOnFail"
title="${uiLabelMap.ScrumUnplanBacklogList}"
navigation-menu-name="notCompleteUnplanBacklogItem">
-
<include-menu name="notCompleteUnplanBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+
<include-menu name="notCompleteUnplanBacklogItem"
location="${parameters.mainMenuLocation}"/>
<include-form name="UnplanBacklogListItemsForOwner"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</fail-widgets>
@@ -2939,13 +2939,13 @@ under the License.
</condition>
<widgets>
<screenlet
id="unplanBacklogListItemsHideDelete"
title="${uiLabelMap.ScrumUnplanBacklogList}"
navigation-menu-name="AllUnplanBacklogItem">
-
<include-menu name="AllUnplanBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+
<include-menu name="AllUnplanBacklogItem"
location="${parameters.mainMenuLocation}"/>
<include-form name="UnplanBacklogListItemsHideDelete"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet
id="unplanBacklogListItemsHideDeleteOnFail"
title="${uiLabelMap.ScrumUnplanBacklogList}"
navigation-menu-name="notCompleteUnplanBacklogItem">
-
<include-menu name="notCompleteUnplanBacklogItem"
location="component://scrum/widget/scrumMenus.xml"/>
+
<include-menu name="notCompleteUnplanBacklogItem"
location="${parameters.mainMenuLocation}"/>
<include-form name="UnplanBacklogListItemsHideDelete"
location="component://scrum/widget/scrumForms.xml"/>
</screenlet>
</fail-widgets>
