Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved: ORDER - Move from hard-code menu location to parameterized (OFBIZ-12944) #729

Merged
merged 1 commit into from
Mar 16, 2024
Merged

Improved: ORDER - Move from hard-code menu location to parameterized (OFBIZ-12944) #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/order/widget/ordermgr/AllocationPlanScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
Expand Down
8 changes: 4 additions & 4 deletions applications/order/widget/ordermgr/CommonScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ under the License.
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="ordermgr" global="true"/>
<set field="applicationMenuName" value="OrderAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://order/widget/ordermgr/OrderMenus.xml" global="true"/>
<set field="applicationMenuLocation" value="${parameters.mainMenuLocation}" global="true"/>
<set field="helpAnchor" from-field="helpAnchor" default-value="_order"/>
<set field="applicationTitle" from-field="uiLabelMap.OrderManagerApplication" global="true"/>
<!-- globally parameterize the link to a customer's detail information, to help with cases when such details are accessed via external application. -->
Expand All @@ -69,12 +69,12 @@ under the License.
<not><if-empty field="custRequest"/></not>
</condition>
<widgets>
<include-menu name="RequestTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="RequestTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
</decorator-section>
<decorator-section name="body">
<include-menu name="RequestSubTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="RequestSubTabBar" location="${parameters.mainMenuLocation}"/>
<container>
<section>
<condition>
Expand Down Expand Up @@ -140,7 +140,7 @@ under the License.
<widgets>
<decorator-screen name="ShortcutDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
<include-menu name="OrderShortcutAppBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="OrderShortcutAppBar" location="${parameters.mainMenuLocation}"/>
</decorator-section>
</decorator-screen>
</widgets>
Expand Down
4 changes: 2 additions & 2 deletions applications/order/widget/ordermgr/CustRequestScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
Expand Down Expand Up @@ -570,7 +570,7 @@ under the License.
</condition>
<widgets>
<screenlet title="${uiLabelMap.OrderIncomingCustRequests}" navigation-menu-name="RequestScreenletMenu">
<include-menu name="RequestScreenletMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="RequestScreenletMenu" location="${parameters.mainMenuLocation}"/>
<include-form name="ListRequestList" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
</widgets>
Expand Down
2 changes: 1 addition & 1 deletion applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"/>
Expand Down
4 changes: 2 additions & 2 deletions applications/order/widget/ordermgr/OrderViewScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
Expand All @@ -48,7 +48,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<include-portal-page id="OrderPortalPage"/>
Expand Down
8 changes: 4 additions & 4 deletions applications/order/widget/ordermgr/QuoteScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
Expand All @@ -43,8 +43,8 @@ under the License.
</condition>
<widgets>
<label style="h1">${uiLabelMap.CommonQuote}:${quote.quoteId}</label>
<include-menu name="QuoteTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="QuoteSubTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="QuoteTabBar" location="${parameters.mainMenuLocation}"/>
<include-menu name="QuoteSubTabBar" location="${parameters.mainMenuLocation}"/>
<container style="page-title">
</container>
</widgets>
Expand Down Expand Up @@ -77,7 +77,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
Expand Down
2 changes: 1 addition & 1 deletion applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<not><if-empty field="quote"/></not>
</condition>
<widgets>
<include-menu name="QuoteTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="QuoteTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<container>
Expand Down
8 changes: 4 additions & 4 deletions applications/order/widget/ordermgr/RequirementScreens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
Expand All @@ -37,7 +37,7 @@ under the License.
<section>
<condition><not><if-empty field="requirement"/></not></condition>
<widgets>
<include-menu name="RequirementTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="RequirementTabBar" location="${parameters.mainMenuLocation}"/>
</widgets>
</section>
<container>
Expand All @@ -59,7 +59,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="MainActionMenu" location="${parameters.mainMenuLocation}"/>
</decorator-section>
<decorator-section name="body">
<section>
Expand All @@ -68,7 +68,7 @@ under the License.
<if-has-permission permission="ORDERMGR" action="_VIEW"/>
</condition>
<widgets>
<include-menu name="RequirementsTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
<include-menu name="RequirementsTabBar" location="${parameters.mainMenuLocation}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Expand Down
Loading