svn commit: r1867586 - in /ofbiz/ofbiz-framework/branche
Locked
svn commit: r1867586 - in /ofbiz/ofbiz-framework/branche
 
|
Author: jleroux
Date: Thu Sep 26 15:39:52 2019 New Revision: 1867586 URL: http://svn.apache.org/viewvc?rev=1867586&view=rev Log: "Applied fix from trunk for revision: 1867585" ------------------------------------------------------------------------ r1867585 | jleroux | 2019-09-26 17:38:52 +0200 (jeu. 26 sept. 2019) | 9 lignes Fixed: Error in log when looking for parties at partymgr/control/main (OFBIZ-11201) These are similar issues in Minilang than the one fixed initially for <set field="userLoginSize" value="${util:size(logins)}" type="Integer"/> Fixed by replacing by <set field="userLoginSize" value="${groovy:logins.size()}"/> ------------------------------------------------------------------------ Modified: ofbiz/ofbiz-framework/branches/release18.12/ (props changed) ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/minilang/fixedasset/FixedAssetServices.xml ofbiz/ofbiz-framework/branches/release18.12/applications/order/minilang/order/OrderReturnServices.xml ofbiz/ofbiz-framework/branches/release18.12/applications/product/minilang/shipment/picklist/PicklistServices.xml ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Propchange: ofbiz/ofbiz-framework/branches/release18.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 26 15:39:52 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141, 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367,1865370,1865811,1865820,1865852,1865883,1865891,1865924,1866259,1866519,1866834,1866890,1866920,1866986,1867038,1867099,1867577 +/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141, 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367,1865370,1865811,1865820,1865852,1865883,1865891,1865924,1866259,1866519,1866834,1866890,1866920,1866986,1867038,1867099,1867577,1867585 Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/minilang/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/minilang/fixedasset/FixedAssetServices.xml?rev=1867586&r1=1867585&r2=1867586&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/minilang/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/minilang/fixedasset/FixedAssetServices.xml Thu Sep 26 15:39:52 2019 @@ -186,7 +186,7 @@ under the License. </entity-condition> <set field="listSize" value="0" type="Long"/> <if-not-empty field="maintList"> - <set field="listSize" value="${util:size(maintList)}" type="Long"/> + <set field="listSize" value="${groovy:maintList.size()}" type="Long"/> </if-not-empty> <set field="maxIntervalQty" value="0" type="BigDecimal"/> <iterate list="maintList" entry="maintValue"> @@ -263,7 +263,7 @@ under the License. <if-not-empty field="compareDate"> <set field="listSize" value="0" type="Long"/> <if-not-empty field="maintList"> - <set field="listSize" value="${util:size(maintList)}" type="Long"/> + <set field="listSize" value="${groovy:maintList.size()}" type="Long"/> </if-not-empty> <set field="lastSvcLong" value="0" type="Long"/> <set field="lastSvcDate" from-field="lastSvcLong" type="Timestamp"/> Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/order/minilang/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/minilang/order/OrderReturnServices.xml?rev=1867586&r1=1867585&r2=1867586&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/applications/order/minilang/order/OrderReturnServices.xml (original) +++ ofbiz/ofbiz-framework/branches/release18.12/applications/order/minilang/order/OrderReturnServices.xml Thu Sep 26 15:39:52 2019 @@ -933,11 +933,11 @@ under the License. <field-map field-name="orderId" from-field="parameters.originOrderId"/> <field-map field-name="returnTypeId" value="RTN_REFUND"/> </entity-and> - <set field="returnItemSize" value="${util:size(returnItems)}" type="Long"/> + <set field="returnItemSize" value="${groovy:returnItems.size()}" type="Long"/> <entity-and entity-name="OrderItem" list="orderItems"> <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> - <set field="orderItemSize" value="${util:size(orderItems)}" type="Long"/> + <set field="orderItemSize" value="${groovy:orderItems.size()}" type="Long"/> <if> <condition> <if-compare-field field="returnItemSize" operator="greater" to-field="orderItemSize" type="Long"/> Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/product/minilang/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1867586&r1=1867585&r2=1867586&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/applications/product/minilang/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/ofbiz-framework/branches/release18.12/applications/product/minilang/shipment/picklist/PicklistServices.xml Thu Sep 26 15:39:52 2019 @@ -188,7 +188,7 @@ under the License. <!-- count no. of locations in location list --> <set field="locationCount" value="0"/> <if-not-empty field="locations"> - <set field="locationCount" value="${util:size(locations)}" type="Long"/> + <set field="locationCount" value="${groovy:locations.size()}" type="Long"/> </if-not-empty> <!-- If order items are picked from different locations of a facility, then create a new group called multiple locations. This order will now belong to this new group --> Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1867586&r1=1867585&r2=1867586&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Thu Sep 26 15:39:52 2019 @@ -1364,7 +1364,7 @@ under the License. </condition-list> <order-by field-name="contactMechPurposeTypeId"/> </entity-condition> - <if-compare field="util:size(contactMechs)" operator="greater" value="0" type="Integer"> + <if-compare field="${groovy:contactMechs.size()}" operator="greater" value="0" type="Integer"> <field-to-result field="contactMechs[0].infoString" result-name="iCalUrl"/> </if-compare> </simple-method> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |