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 d46cac29c0 Improved: CATALOG - Move from hard-code menu location to
parameterized (OFBIZ-12947) (#766)
d46cac29c0 is described below
commit d46cac29c03088326c0d050ae187d16f436229fc
Author: Pierre Smits <pierre.sm...@somonar.com>
AuthorDate: Wed Apr 17 17:25:52 2024 +0200
Improved: CATALOG - Move from hard-code menu location to parameterized
(OFBIZ-12947) (#766)
CATALOG - Move from hard-code menu location to parameterized
modified:
CatalogMenus.xml: added subscription menus
SubscriptionScreens.xml: changed menu location(s) from hard-coded to
parameterized
deleted:
SubscriptionMenus.xml
---
.../product/widget/catalog/CatalogMenus.xml | 31 ++++++++++++
.../product/widget/catalog/SubscriptionMenus.xml | 55 ----------------------
.../product/widget/catalog/SubscriptionScreens.xml | 4 +-
3 files changed, 33 insertions(+), 57 deletions(-)
diff --git a/applications/product/widget/catalog/CatalogMenus.xml
b/applications/product/widget/catalog/CatalogMenus.xml
index e49b100050..090c810049 100644
--- a/applications/product/widget/catalog/CatalogMenus.xml
+++ b/applications/product/widget/catalog/CatalogMenus.xml
@@ -712,4 +712,35 @@ under the License.
</link>
</menu-item>
</menu>
+ <menu name="EditSubscription" default-selected-style="selected"
type="simple"
+ menu-container-style="button-bar tab-bar"
selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="EditSubscription"
title="${uiLabelMap.ProductSubscription}">
+ <link target="EditSubscription">
+ <parameter param-name="subscriptionId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditSubscriptionAttributes"
title="${uiLabelMap.ProductSubscriptionAttributes}">
+ <link target="EditSubscriptionAttributes">
+ <parameter param-name="subscriptionId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditSubscriptionCommEvent"
title="${uiLabelMap.ProductSubscriptionCommEvent}">
+ <link target="EditSubscriptionCommEvent">
+ <parameter param-name="subscriptionId"/>
+ </link>
+ </menu-item>
+ </menu>
+ <menu name="EditSubscriptionResource" default-selected-style="selected"
type="simple"
+ menu-container-style="button-bar tab-bar"
selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="EditSubscriptionResource"
title="${uiLabelMap.ProductSubscriptionResource}">
+ <link target="EditSubscriptionResource">
+ <parameter param-name="subscriptionResourceId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditSubscriptionResourceProducts"
title="${uiLabelMap.ProductProducts}">
+ <link target="EditSubscriptionResourceProducts">
+ <parameter param-name="subscriptionResourceId"/>
+ </link>
+ </menu-item>
+ </menu>
</menus>
diff --git a/applications/product/widget/catalog/SubscriptionMenus.xml
b/applications/product/widget/catalog/SubscriptionMenus.xml
deleted file mode 100644
index eee723e3a3..0000000000
--- a/applications/product/widget/catalog/SubscriptionMenus.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://ofbiz.apache.org/Widget-Menu";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Menu
http://ofbiz.apache.org/dtds/widget-menu.xsd";>
- <menu name="EditSubscription" default-selected-style="selected"
type="simple"
- menu-container-style="button-bar tab-bar"
selected-menuitem-context-field-name="tabButtonItem">
- <menu-item name="EditSubscription"
title="${uiLabelMap.ProductSubscription}">
- <link target="EditSubscription">
- <parameter param-name="subscriptionId"/>
- </link>
- </menu-item>
- <menu-item name="EditSubscriptionAttributes"
title="${uiLabelMap.ProductSubscriptionAttributes}">
- <link target="EditSubscriptionAttributes">
- <parameter param-name="subscriptionId"/>
- </link>
- </menu-item>
-
- <menu-item name="EditSubscriptionCommEvent"
title="${uiLabelMap.ProductSubscriptionCommEvent}">
- <link target="EditSubscriptionCommEvent">
- <parameter param-name="subscriptionId"/>
- </link>
- </menu-item>
- </menu>
- <menu name="EditSubscriptionResource" default-selected-style="selected"
type="simple"
- menu-container-style="button-bar tab-bar"
selected-menuitem-context-field-name="tabButtonItem">
- <menu-item name="EditSubscriptionResource"
title="${uiLabelMap.ProductSubscriptionResource}">
- <link target="EditSubscriptionResource">
- <parameter param-name="subscriptionResourceId"/>
- </link>
- </menu-item>
- <menu-item name="EditSubscriptionResourceProducts"
title="${uiLabelMap.ProductProducts}">
- <link target="EditSubscriptionResourceProducts">
- <parameter param-name="subscriptionResourceId"/>
- </link>
- </menu-item>
- </menu>
-</menus>
diff --git a/applications/product/widget/catalog/SubscriptionScreens.xml
b/applications/product/widget/catalog/SubscriptionScreens.xml
index 6c9b0f44e1..b076190f51 100644
--- a/applications/product/widget/catalog/SubscriptionScreens.xml
+++ b/applications/product/widget/catalog/SubscriptionScreens.xml
@@ -89,7 +89,7 @@ under the License.
<not><if-empty
field="subscription"/></not>
</condition>
<widgets>
- <include-menu name="EditSubscription"
location="component://product/widget/catalog/SubscriptionMenus.xml"/>
+ <include-menu name="EditSubscription"
location="${parameters.mainMenuLocation}"/>
<container style="button-bar"><link
target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}"
style="buttontext"/></container>
<container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${subscription.description} [${subscriptionId}]</label></container>
</widgets>
@@ -216,7 +216,7 @@ under the License.
<not><if-empty
field="subscriptionResource"/></not>
</condition>
<widgets>
- <include-menu
name="EditSubscriptionResource"
location="component://product/widget/catalog/SubscriptionMenus.xml"/>
+ <include-menu
name="EditSubscriptionResource" location="${parameters.mainMenuLocation}"/>
<container style="button-bar">
<link
target="EditSubscriptionResource"
text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext"/>
<link target="FindSubscription"
text="${uiLabelMap.ProductFindResourceSubscriptions}" style="buttontext">
