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 c1603b2 Improved: List and Grid (OFBIZ-11345) (#368)
c1603b2 is described below
commit c1603b2c73268a6d7c1ee6c89ab3f6c75b3e069a
Author: Pierre Smits <[email protected]>
AuthorDate: Mon Nov 29 18:44:19 2021 +0100
Improved: List and Grid (OFBIZ-11345) (#368)
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:
GlobalGlAccountsScreens.xml: from form ref to grid ref , additional cleanup
GlobalGlAccountsForms.xml: from form definition with list ref to grid
definition with list ref, additional clean-up
---
applications/accounting/widget/GlobalGlAccountsForms.xml | 12 ++++++------
applications/accounting/widget/GlobalGlAccountsScreens.xml | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/applications/accounting/widget/GlobalGlAccountsForms.xml
b/applications/accounting/widget/GlobalGlAccountsForms.xml
index dc46b82..e3d30c9 100644
--- a/applications/accounting/widget/GlobalGlAccountsForms.xml
+++ b/applications/accounting/widget/GlobalGlAccountsForms.xml
@@ -66,7 +66,7 @@ under the License.
<field name="submitButton"
title="${uiLabelMap.AccountingCreateAssignment}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListGlAccount" list-name="listIt" target="" title=""
type="list" default-entity-name="GlAccount"
+ <grid name="ListGlAccount" list-name="listIt"
default-entity-name="GlAccount"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<set field="entityName" value="GlAccount"/>
@@ -100,7 +100,7 @@ under the License.
<field name="description"><display/></field>
<field name="productId"><display-entity entity-name="Product"/></field>
<field name="externalId"><display/></field>
- </form>
+ </grid>
<form name="ListGlAccountPdf" extends="ListGlAccount">
<actions>
<entity-condition entity-name="GlAccount" list="listIt"/>
@@ -158,7 +158,7 @@ under the License.
</form>
<!-- this is used to list AcctgTransEntries and can be called either by
using an acctgTransId or a glAccountId -->
- <form name="ListAcctgTransEntries" type="list" list-name="entries"
default-entity-name="AcctgTransEntry"
+ <grid name="ListAcctgTransEntries" list-name="entries"
default-entity-name="AcctgTransEntry"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="acctgTransId">
<hyperlink description="${acctgTransId}"
target="ListAcctgTransEntries" also-hidden="false">
@@ -183,7 +183,7 @@ under the License.
<field name="reconcileStatusId"><display/></field>
<field name="settlementTermId"><display/></field>
<field name="isSummary"><display/></field>
- </form>
+ </grid>
<form name="GlAccountsNavForm" type="single" target="" title="GL Accounts"
default-map-name="journal"
header-row-style="header-row" default-table-style="basic-table">
@@ -229,7 +229,7 @@ under the License.
<field name="acctgTransEntrySeqId"><display/></field>
<field name="reconciledAmount"><display/></field>
</form>
- <form name="ListRateAmounts" type="list" target="expireRateAmount"
paginate-target="viewRateAmounts"
+ <grid name="ListRateAmounts" target="expireRateAmount"
paginate-target="viewRateAmounts"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<set field="sortField" from-field="parameters.sortField"
default-value="rateTypeId"/>
@@ -253,7 +253,7 @@ under the License.
<field name="emplPositionTypeId" sort-field="true"><display
description="${employeePositionDescription}"/></field>
<field name="rateAmount"><display type="currency"
currency="${rateCurrencyUomId}"/></field>
<field name="delete"
title="${uiLabelMap.CommonDelete}"><submit/></field>
- </form>
+ </grid>
<form name="UpdateRateAmount" type="single" target="updateRateAmount"
default-service-name="updateRateAmount"
header-row-style="header-row" default-table-style="basic-table">
diff --git a/applications/accounting/widget/GlobalGlAccountsScreens.xml
b/applications/accounting/widget/GlobalGlAccountsScreens.xml
index 00ac362..55cb50f 100644
--- a/applications/accounting/widget/GlobalGlAccountsScreens.xml
+++ b/applications/accounting/widget/GlobalGlAccountsScreens.xml
@@ -157,7 +157,7 @@ under the License.
<include-tree name="ListGlAccountTree"
location="component://accounting/widget/AccountingTrees.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleViewGlAccountEntries}">
- <include-form name="ListAcctgTransEntries"
location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
+ <include-grid name="ListAcctgTransEntries"
location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -239,7 +239,7 @@ under the License.
<link target="ListGlAccountsReport"
target-window="_blank" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ListGlAccountsExport"
target-window="_blank" text="${uiLabelMap.CommonExport}" style="buttontext"/>
</container>
- <include-form name="ListGlAccount"
location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
+ <include-grid name="ListGlAccount"
location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -310,7 +310,7 @@ under the License.
<screenlet
title="${uiLabelMap.AccountingUpdateRateAmount}"
navigation-form-name="ListRateAmounts">
<include-form name="UpdateRateAmount"
location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</screenlet>
- <include-form name="ListRateAmounts"
location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
+ <include-grid name="ListRateAmounts"
location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
