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 2019/04/09 12:00:04 UTC
svn commit: r1857184 - in /ofbiz/branches/release16.11: ./
applications/order/minilang/shoppinglist/ applications/order/minilang/test/
applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/
Author: jleroux
Date: Tue Apr 9 12:00:04 2019
New Revision: 1857184
URL: http://svn.apache.org/viewvc?rev=1857184&view=rev
Log:
"Applied fix from trunk framework for revision: 1857180"
------------------------------------------------------------------------
r1857180 | jleroux | 2019-04-09 13:58:22 +0200 (mar. 09 avr. 2019) | 19 lignes
Fixed: Quick Add button for shopping list on Orderentry screen is not working
(OFBIZ-9908)
Steps to generate
1. Navigate to https://demo-trunk.ofbiz.apache.org/ordermgr/control/orderentry
2. Press continue on sales order screen.
3. Add any finished good product to the sales order
4. In 'Add Order Items to Shopping List' section, select 'new shopping list'
from the drop down and click on 'Add to shopping list' button
5. you navigate to 'addBulkToShoppingList' screen, click on 'Quick Add' button.
Issue: The quick add button is not working.
jleroux: as suggested by Ankush: "One of possible workaround is calling
createShoppingList with new transaction to resolve this deadlock issue."
This just does that for every calls.
Thanks: Garima jain for report, Rohit Hukkeri for discussion and Ankush Upadhyay
for fix suggestion
------------------------------------------------------------------------
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/order/minilang/shoppinglist/ShoppingListServices.xml
ofbiz/branches/release16.11/applications/order/minilang/test/ShoppingListTests.xml
ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 9 12:00:04 2019
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
1816289,1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247,1851319,1851805,1851998,1852587,1852818,1853070,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,18566
67
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
1816289,1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247,1851319,1851805,1851998,1852587,1852818,1853070,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,18566
67,1857180
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified: ofbiz/branches/release16.11/applications/order/minilang/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/minilang/shoppinglist/ShoppingListServices.xml?rev=1857184&r1=1857183&r2=1857184&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/minilang/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/branches/release16.11/applications/order/minilang/shoppinglist/ShoppingListServices.xml Tue Apr 9 12:00:04 2019
@@ -338,7 +338,7 @@ under the License.
<set field="createShoppingListInMap.listName" value="Auto Suggestions"/>
<set field="createShoppingListInMap.shoppingListTypeId" value="SLT_WISH_LIST"/>
<set field="createShoppingListInMap.productStoreId" from-field="parameters.productStoreId"/>
- <call-service service-name="createShoppingList" in-map-name="createShoppingListInMap">
+ <call-service service-name="createShoppingList" in-map-name="createShoppingListInMap" require-new-transaction="true">
<result-to-field result-name="shoppingListId"/>
</call-service>
<else>
Modified: ofbiz/branches/release16.11/applications/order/minilang/test/ShoppingListTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/minilang/test/ShoppingListTests.xml?rev=1857184&r1=1857183&r2=1857184&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/minilang/test/ShoppingListTests.xml (original)
+++ ofbiz/branches/release16.11/applications/order/minilang/test/ShoppingListTests.xml Tue Apr 9 12:00:04 2019
@@ -33,7 +33,7 @@ under the License.
<field-map field-name="userLoginId" value="DemoCustomer"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
- <call-service service-name="createShoppingList" in-map-name="serviceCtx">
+ <call-service service-name="createShoppingList" in-map-name="serviceCtx" require-new-transaction="true">
<result-to-field result-name="shoppingListId"/>
</call-service>
<entity-one entity-name="ShoppingList" value-field="shoppingList"/>
Modified: ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=1857184&r1=1857183&r2=1857184&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java (original)
+++ ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java Tue Apr 9 12:00:04 2019
@@ -104,7 +104,10 @@ public class ShoppingListEvents {
// create a new shopping list
Map<String, Object> newListResult = null;
try {
- newListResult = dispatcher.runSync("createShoppingList", UtilMisc.<String, Object>toMap("userLogin", userLogin, "productStoreId", cart.getProductStoreId(), "partyId", cart.getOrderPartyId(), "shoppingListTypeId", shoppingListTypeId, "currencyUom", cart.getCurrency()));
+ newListResult = dispatcher.runSync("createShoppingList", UtilMisc.<String, Object>toMap("userLogin", userLogin,
+ "productStoreId", cart.getProductStoreId(), "partyId", cart.getOrderPartyId(),
+ "shoppingListTypeId", shoppingListTypeId, "currencyUom", cart.getCurrency()),
+ 90, true);
} catch (GenericServiceException e) {
Debug.logError(e, "Problems creating new ShoppingList", module);
errMsg = UtilProperties.getMessage(resource_error,"shoppinglistevents.cannot_create_new_shopping_list", cart.getLocale());
@@ -377,7 +380,7 @@ public class ShoppingListEvents {
}
if (list == null && dispatcher != null) {
Map<String, Object> listFields = UtilMisc.<String, Object>toMap("userLogin", userLogin, "productStoreId", productStoreId, "shoppingListTypeId", "SLT_SPEC_PURP", "listName", PERSISTANT_LIST_NAME);
- Map<String, Object> newListResult = dispatcher.runSync("createShoppingList", listFields);
+ Map<String, Object> newListResult = dispatcher.runSync("createShoppingList", listFields, 90, true););
if (newListResult != null) {
autoSaveListId = (String) newListResult.get("shoppingListId");
@@ -653,7 +656,7 @@ public class ShoppingListEvents {
if (UtilValidate.isEmpty(autoSaveListId)) {
try {
Map<String, Object> listFields = UtilMisc.<String, Object>toMap("userLogin", userLogin, "productStoreId", productStoreId, "shoppingListTypeId", "SLT_SPEC_PURP", "listName", PERSISTANT_LIST_NAME);
- Map<String, Object> newListResult = dispatcher.runSync("createShoppingList", listFields);
+ Map<String, Object> newListResult = dispatcher.runSync("createShoppingList", listFields, 90, true););
if (newListResult != null) {
autoSaveListId = (String) newListResult.get("shoppingListId");
}
Modified: ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1857184&r1=1857183&r2=1857184&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java (original)
+++ ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java Tue Apr 9 12:00:04 2019
@@ -292,7 +292,7 @@ public class ShoppingListServices {
Map<String, Object> newListResult = null;
try {
- newListResult = dispatcher.runSync("createShoppingList", serviceCtx);
+ newListResult = dispatcher.runSync("createShoppingList", serviceCtx, 90, true););
} catch (GenericServiceException e) {
Debug.logError(e, "Problems creating new ShoppingList", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderUnableToCreateNewShoppingList",locale));