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 092f8f5 Improved: List and Grid (OFBIZ-11345) (#423)
092f8f5 is described below
commit 092f8f532a628d56174c5eb8850774c61375c0c2
Author: Pierre Smits <pierre.sm...@orrtiz.com>
AuthorDate: Sun Jan 16 14:05:55 2022 +0100
Improved: List and Grid (OFBIZ-11345) (#423)
According to the definition in widget-form.xsd the use of a combination of a
form with type="list" is deprecated in favour of a grid.
Refactor various list forms into grids.
Refactor various list form references in screens.
Modified:
SubscriptionScreens.xml: from form ref to grid ref , additional cleanup
SubscriptionForms.xml: from form definition with list ref to grid definition
with list ref, additional clean-up
jleroux: some modification after pushing previous commit from GH
In previous commit I noticed that Pierre used the CommonProduct label that I
committed for Pierre's "Adding som Dutch translations to common labels."
OFBIZ-6016
I did not notice then that there was already a more complete ProductProduct
label. I see no reason to create a new CommonProduct label. So I copied 2
lines
not present in ProductProduct from CommonProduct and removed the "nl" line
that
is a duplicate of the "en" line.
With Michael we already said to Pierre that we don't like to review, before
pushing PR, not related changes mixed with what is announced by the title.
It
complicates the review. I still remember being admonished by David E. Jones
when
committing as a new committer doing the same. In the same David's spirit I
see
no necessity to remove empty lines when it complicates the review...
Long story short, better make 2 different PR when such things is really
necessary...
I did not remove the <sub-hyperlink from communicationEventId lookup in
SubscriptionForms.xml. I checked there are 21 other cases like that in code.
Also better to remember to have lines not longer than 80 chars in commit
comment.
All the rest is OK with me
---
applications/product/config/ProductUiLabels.xml | 2 ++
.../product/widget/catalog/SubscriptionForms.xml | 18 ++++++++++++------
framework/common/config/CommonUiLabels.xml | 8 --------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/applications/product/config/ProductUiLabels.xml
b/applications/product/config/ProductUiLabels.xml
index 4d4f43d..b296d7a 100644
--- a/applications/product/config/ProductUiLabels.xml
+++ b/applications/product/config/ProductUiLabels.xml
@@ -25739,6 +25739,8 @@
<value xml:lang="de">Produkt</value>
<value xml:lang="en">Product</value>
<value xml:lang="es">Producto</value>
+ <value xml:lang="es-CL">Producto</value>
+ <value xml:lang="es-MX">Producto</value>
<value xml:lang="fr">Article</value>
<value xml:lang="it">Prodotto</value>
<value xml:lang="ja">製品</value>
diff --git a/applications/product/widget/catalog/SubscriptionForms.xml
b/applications/product/widget/catalog/SubscriptionForms.xml
index 413460f..5323cea 100644
--- a/applications/product/widget/catalog/SubscriptionForms.xml
+++ b/applications/product/widget/catalog/SubscriptionForms.xml
@@ -56,7 +56,7 @@ under the License.
</drop-down>
</field>
<field name="orderId" title="${uiLabelMap.CommonOrder}"><lookup
target-form-name="LookupOrderHeader"/></field>
- <field name="productId" title="${uiLabelMap.CommonProduct}"><lookup
target-form-name="LookupProduct"/></field>
+ <field name="productId" title="${uiLabelMap.ProductProduct}"><lookup
target-form-name="LookupProduct"/></field>
<field name="productCategoryId"
title="${uiLabelMap.CommonCategory}"><lookup
target-form-name="LookupProductCategory"/></field>
<field name="automaticExtend" title="Automatic Extend" ><!-- TODO:
${uiLabelMap.FormFieldTitle_automaticExtend} get overwritten with the
description of the field from the entitymodel-->
<drop-down allow-empty="true">
@@ -130,7 +130,7 @@ under the License.
<parameter param-name="orderId"/>
</hyperlink>
</field>
- <field name="productId" title="${uiLabelMap.CommonProduct}">
+ <field name="productId" title="${uiLabelMap.ProductProduct}">
<display-entity entity-name="Product" description="${productName}">
<sub-hyperlink target="/catalog/control/EditProduct"
target-type="inter-app" description="${productId}" link-style="buttontext">
<parameter param-name="productId"/>
@@ -241,7 +241,7 @@ under the License.
</sub-hyperlink>
</lookup>
</field>
- <field name="productId" title="${uiLabelMap.CommonProduct}">
+ <field name="productId" title="${uiLabelMap.ProductProduct}">
<lookup target-form-name="LookupProduct">
<sub-hyperlink target="/catalog/control/EditProduct"
target-type="inter-app" description="${subscription.productId}"
link-style="buttontext">
<parameter param-name="productId"
from-field="subscription.productId"/>
@@ -351,7 +351,7 @@ under the License.
</actions>
<auto-fields-service service-name="updateProductSubscriptionResource"/>
<field name="subscriptionResourceId"><hidden/></field>
- <field name="productId"
title="${uiLabelMap.CommonProduct}"><display/></field>
+ <field name="productId"
title="${uiLabelMap.ProductProduct}"><display/></field>
<field name="useTimeUomId">
<drop-down>
<entity-options entity-name="Uom" key-field-name="uomId"
description="${description} (${abbreviation})">
@@ -394,7 +394,7 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createProductSubscriptionResource"/>
<field name="subscriptionResourceId"><hidden/></field>
- <field name="productId" title="${uiLabelMap.CommonProduct}"><lookup
target-form-name="LookupProduct"/></field>
+ <field name="productId" title="${uiLabelMap.ProductProduct}"><lookup
target-form-name="LookupProduct"/></field>
<field name="useTimeUomId">
<drop-down allow-empty="false">
<entity-options entity-name="Uom" key-field-name="uomId"
description="${description} (${abbreviation})">
@@ -476,7 +476,13 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createSubscriptionCommEvent"/>
<field name="subscriptionId"><hidden
value="${parameters.subscriptionId}"/></field>
- <field name="communicationEventId"><lookup
target-form-name="LookupCommEvent"/></field>
+ <field name="communicationEventId">
+ <lookup target-form-name="LookupCommEvent">
+ <sub-hyperlink
target="/partymgr/control/ViewCommunicationEvent" target-type="inter-app"
link-type="hidden-form" description="${subscription.communicationEventId}"
link-style="buttontext">
+ <parameter param-name="communicationEventId"
from-field="subscription.communicationEventId"/>
+ </sub-hyperlink>
+ </lookup>
+ </field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>
diff --git a/framework/common/config/CommonUiLabels.xml
b/framework/common/config/CommonUiLabels.xml
index 8d427ac..5f431d5 100644
--- a/framework/common/config/CommonUiLabels.xml
+++ b/framework/common/config/CommonUiLabels.xml
@@ -9436,14 +9436,6 @@
<value xml:lang="zh-CN">处理中</value>
<value xml:lang="zh-TW">處理中</value>
</property>
- <property key="CommonProduct">
- <value xml:lang="en">Product</value>
- <value xml:lang="es">Producto</value>
- <value xml:lang="es-CL">Producto</value>
- <value xml:lang="es-MX">Producto</value>
- <value xml:lang="nl">Product</value>
- <value xml:lang="zh">产品</value>
- </property>
<property key="CommonProductRating"><!-- Used to demark the section where
ProductRating setting are made. -->
<value xml:lang="de">Bewertung</value>
<value xml:lang="en">Rating</value>
