You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2022/01/08 07:59:33 UTC
[ofbiz-framework] branch trunk updated: Improved: List and Grid (OFBIZ-11345) (#432)
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 1b0b723 Improved: List and Grid (OFBIZ-11345) (#432)
1b0b723 is described below
commit 1b0b7238870a4788fcf95ea9f302e344665919da
Author: Pierre Smits <pi...@orrtiz.com>
AuthorDate: Sat Jan 8 08:59:28 2022 +0100
Improved: List and Grid (OFBIZ-11345) (#432)
Refactor various list forms into grids.
Refactor various list form references in screens.
Modified:
FacilityGroupScreens.xml: from form ref to grid ref , additional cleanup
FacilityGroupForms.xml: from form definition with list ref to grid definition with list ref, additional clean-up
---
.../product/widget/facility/FacilityGroupForms.xml | 20 ++++++++++----------
.../product/widget/facility/FacilityGroupScreens.xml | 18 +++++++++++++-----
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/applications/product/widget/facility/FacilityGroupForms.xml b/applications/product/widget/facility/FacilityGroupForms.xml
index d07bd3c..9f3390b 100644
--- a/applications/product/widget/facility/FacilityGroupForms.xml
+++ b/applications/product/widget/facility/FacilityGroupForms.xml
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
<!-- Forms for FacilityGroups -->
- <form name="FindFacilityGroup" type="list" title="" list-name="facilityGroups" paginate-target="FindFacilityGroup"
+ <grid name="FindFacilityGroup" list-name="facilityGroups" paginate-target="FindFacilityGroup"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="FacilityGroup" default-field-type="display"/>
<field name="facilityGroupId" widget-style="buttontext">
@@ -31,7 +31,7 @@ under the License.
</field>
<field name="facilityGroupTypeId"><display-entity entity-name="FacilityGroupType"/></field>
<field name="description"><display/></field>
- </form>
+ </grid>
<form name="EditFacilityGroup" type="single" target="updateFacilityGroup" title="" default-map-name="facilityGroup"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="facilityGroup==null" target="createFacilityGroup"/>
@@ -52,7 +52,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
- <form name="UpdateFacilityGroupRollupTo" type="list" target="updateFacilityGroupToGroup" title="" list-name="currentGroupRollups"
+ <grid name="UpdateFacilityGroupRollupTo" list-name="currentGroupRollups" target="updateFacilityGroupToGroup"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
<auto-fields-service service-name="updateFacilityGroupToGroup"/>
<field name="showFacilityGroupId"><hidden value="${facilityGroupId}"/></field>
@@ -74,7 +74,7 @@ under the License.
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="AddFacilityGroupRollupFrom" target="addFacilityGroupToGroup" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addFacilityGroupToGroup"/>
@@ -89,7 +89,7 @@ under the License.
<field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
- <form name="UpdateFacilityGroupRollupFrom" type="list" target="updateFacilityGroupToGroup" title="" list-name="parentGroupRollups"
+ <grid name="UpdateFacilityGroupRollupFrom" list-name="parentGroupRollups" target="updateFacilityGroupToGroup"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
<auto-fields-service service-name="updateFacilityGroupToGroup"/>
<field name="showFacilityGroupId"><hidden value="${parentFacilityGroupId}"/></field>
@@ -111,7 +111,7 @@ under the License.
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="AddFacilityGroupRollupTo" target="addFacilityGroupToGroup" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addFacilityGroupToGroup"/>
@@ -127,7 +127,7 @@ under the License.
<field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
- <form name="UpdateFacilityGroupMembers" type="list" target="updateFacilityToGroup" title="" list-name="facilityGroupMembers"
+ <grid name="UpdateFacilityGroupMembers" list-name="facilityGroupMembers" target="updateFacilityToGroup"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
<auto-fields-service service-name="updateFacilityToGroup"/>
<field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field>
@@ -147,7 +147,7 @@ under the License.
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="AddFacilityGroupMember" target="addFacilityToGroup" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addFacilityToGroup"/>
@@ -162,7 +162,7 @@ under the License.
<field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
- <form name="UpdateFacilityGroupRoles" type="list" target="removePartyFromFacilityGroup" title="" list-name="facilityRoles"
+ <grid name="UpdateFacilityGroupRoles" list-name="facilityRoles" target="removePartyFromFacilityGroup"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="removePartyFromFacilityGroup"/>
<field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field>
@@ -183,7 +183,7 @@ under the License.
<parameter param-name="roleTypeId"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="AddFacilityGroupRole" target="addPartyToFacilityGroup" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addPartyToFacilityGroup"/>
diff --git a/applications/product/widget/facility/FacilityGroupScreens.xml b/applications/product/widget/facility/FacilityGroupScreens.xml
index aa672ab..4b0d02b 100644
--- a/applications/product/widget/facility/FacilityGroupScreens.xml
+++ b/applications/product/widget/facility/FacilityGroupScreens.xml
@@ -34,7 +34,7 @@ under the License.
<container style="button-bar">
<link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
</container>
- <include-form name="FindFacilityGroup" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ <include-grid name="FindFacilityGroup" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -120,7 +120,9 @@ under the License.
<screenlet id="AddFacilityGroupMemberPanel" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
<include-form name="AddFacilityGroupMember" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
- <include-form name="UpdateFacilityGroupMembers" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ <screenlet>
+ <include-grid name="UpdateFacilityGroupMembers" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -147,7 +149,9 @@ under the License.
<screenlet id="AddFacilityGroupRolePanel" title="${uiLabelMap.ProductAddFacilityGroupPartyRole}" collapsible="true">
<include-form name="AddFacilityGroupRole" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
- <include-form name="UpdateFacilityGroupRoles" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ <screenlet>
+ <include-grid name="UpdateFacilityGroupRoles" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -175,11 +179,15 @@ under the License.
<screenlet id="AddFacilityGroupRollupFromPanel" title="${uiLabelMap.PageTitleAddFacilityGroupRollup}" collapsible="true">
<include-form name="AddFacilityGroupRollupFrom" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
- <include-form name="UpdateFacilityGroupRollupTo" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ <screenlet>
+ <include-grid name="UpdateFacilityGroupRollupTo" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ </screenlet>
<screenlet id="AddFacilityGroupRollupToPanel" title="${uiLabelMap.ProductGroupRollupChildGroupsAdd}" collapsible="true">
<include-form name="AddFacilityGroupRollupTo" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
- <include-form name="UpdateFacilityGroupRollupFrom" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ <screenlet>
+ <include-grid name="UpdateFacilityGroupRollupFrom" location="component://product/widget/facility/FacilityGroupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>