svn commit: r1661874 - in /ofbiz/branches/release14.12: ./ applications/workeffort/widget/WorkEffortForms.xml

Author: jleroux
Date: Tue Feb 24 09:53:32 2015
New Revision: 1661874

URL: http://svn.apache.org/r1661874
Log:
"Applied fix from trunk for revision: 1661873  "
------------------------------------------------------------------------
r1661873 | jleroux | 2015-02-24 10:52:59 +0100 (mar., 24 févr. 2015) | 3 lines

A patch from  Deepak Dixit for "Pagination at find WorkEffort screen does not work" https://issues.apache.org/jira/browse/OFBIZ-5929

Pagination (previous, next) does not work in find workeffort screen.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortForms.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 09:53:32 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661778,1661853,1661862
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661778,1661853,1661862,1661873

Modified: ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortForms.xml?rev=1661874&r1=1661873&r2=1661874&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortForms.xml Tue Feb 24 09:53:32 2015
@@ -396,18 +396,18 @@ under the License.
         </sort-order>
     </form>
 
-    <form name="ListWorkEfforts" type="list" list-name="workEfforts" paginate-target="ListWorkEfforts"
+    <form name="ListWorkEfforts" type="list" list-name="listIt" paginate-target="ListWorkEfforts"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
+            <set field="fieldList" value="${groovy:['workEffortId','workEffortTypeId','currentStatusId','workEffortPurposeTypeId','description','priority','lastModifiedDate','estimatedStartDate','estimatedCompletionDate','actualStartDate','actualCompletionDate']}" type="List"/>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="WorkEffortFindView"/>
+                <field-map field-name="fieldList" from-field="fieldList"/>
                 <field-map field-name="orderBy" value="lastModifiedDate DESC"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
-                <field-map field-name="viewSize" from-field="viewSize"/>              
-            </service>
-            <service service-name="removeDuplicateWorkEfforts" result-map="result" result-map-list="workEfforts">
-                <field-map field-name="workEffortIterator" from-field="listIt"/>
+                <field-map field-name="viewSize" from-field="viewSize"/>
+                <field-map field-name="distinct" value="Y"/>
             </service>
         </actions>
         <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">