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 b1c0465  Improved: List and Grid (OFBIZ-11345) (#495)
b1c0465 is described below

commit b1c04652029552a38f60fe047fe8a9aac0a80e17
Author: Pierre Smits <pierre.sm...@orrtiz.com>
AuthorDate: Mon Jan 31 11:52:15 2022 +0100

    Improved: List and Grid (OFBIZ-11345) (#495)
    
    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:
    PerfReviewScreens.xml.xml: from form ref to grid ref
    PerfReviewForms.xml: from form definition with list ref to grid definition 
with list ref, additional clean-up
---
 applications/humanres/widget/PerfReviewScreens.xml     | 6 ++++--
 applications/humanres/widget/forms/PerfReviewForms.xml | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/applications/humanres/widget/PerfReviewScreens.xml 
b/applications/humanres/widget/PerfReviewScreens.xml
index fbca067..0578688 100644
--- a/applications/humanres/widget/PerfReviewScreens.xml
+++ b/applications/humanres/widget/PerfReviewScreens.xml
@@ -46,7 +46,7 @@
                                 <include-form name="FindPerfReviews" 
location="component://humanres/widget/forms/PerfReviewForms.xml"/>
                             </decorator-section>
                             <decorator-section name="search-results">
-                                <include-form name="ListPerfReviews" 
location="component://humanres/widget/forms/PerfReviewForms.xml"/>
+                                <include-grid name="ListPerfReviews" 
location="component://humanres/widget/forms/PerfReviewForms.xml"/>
                             </decorator-section>
                         </decorator-screen>
                     </decorator-section>
@@ -93,10 +93,12 @@
             <widgets>
                 <decorator-screen name="CommonPerfReviewDecorator" 
location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="ListPerfReviewItems" 
location="component://humanres/widget/forms/PerfReviewForms.xml"/>
                         <screenlet id="AddPerfReviewItemPanel" 
title="${uiLabelMap.HumanResAddPerfReviewItems}" collapsible="true">
                             <include-form name="AddPerfReviewItem" 
location="component://humanres/widget/forms/PerfReviewForms.xml"/>
                         </screenlet>
+                        <screenlet  title="${uiLabelMap.CommonItems}">
+                            <include-grid name="ListPerfReviewItems" 
location="component://humanres/widget/forms/PerfReviewForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
diff --git a/applications/humanres/widget/forms/PerfReviewForms.xml 
b/applications/humanres/widget/forms/PerfReviewForms.xml
index b3c529d..96a66a3 100644
--- a/applications/humanres/widget/forms/PerfReviewForms.xml
+++ b/applications/humanres/widget/forms/PerfReviewForms.xml
@@ -32,7 +32,7 @@ under the License.
         <field name="emplPositionId" 
title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup 
target-form-name="LookupEmplPosition"/></field>
         <field name="searchButton" title="${uiLabelMap.CommonFind}" 
widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListPerfReviews" type="list" title="" separate-columns="true" 
default-entity-name="PerfReview" list-name="listIt" 
paginate-target="FindPerfReviews" paginate="true"
+    <grid name="ListPerfReviews" list-name="listIt" separate-columns="true" 
default-entity-name="PerfReview" paginate-target="FindPerfReviews" 
paginate="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" 
default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map="result" 
result-map-list="listIt">
@@ -65,7 +65,7 @@ under the License.
         </field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>
-    </form>
+    </grid>
     <form name="EditPerfReview" type="single" target="updatePerfReview" 
title="" default-map-name="perfReview"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="perfReview==null" target="createPerfReview"/>
@@ -87,7 +87,7 @@ under the License.
         <field name="submitButton" use-when="perfReview==null" 
title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit 
button-type="button"/></field>
         <field name="submitButton" use-when="perfReview!=null" 
title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit 
button-type="button"/></field>
     </form>
-    <form name="ListPerfReviewItems" type="list" target="updatePerfReviewItem" 
title="updatePerfReviewItem" paginate-target="findPerfReviewItems"
+    <grid name="ListPerfReviewItems" target="updatePerfReviewItem" 
title="updatePerfReviewItem" paginate-target="findPerfReviewItems"
         odd-row-style="alternate-row" header-row-style="header-row-2" 
default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="PerfReviewItem">
@@ -109,7 +109,7 @@ under the License.
                 <parameter param-name="perfReviewItemSeqId"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
     <form name="AddPerfReviewItem" type="single" target="createPerfReviewItem" 
title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPerfReviewItem"/>

Reply via email to