Author: jleroux
Date: Tue Apr 9 15:33:05 2019
New Revision: 1857214
URL: http://svn.apache.org/viewvc?rev=1857214&view=rev
Log:
"Applied fix from trunk for revision: 1857213"
------------------------------------------------------------------------
r1857213 | jleroux | 2019-04-09 17:31:50 +0200 (mar. 09 avr. 2019) | 4 lignes
Fixed: Quick Add button for shopping list on Orderentry screen is not working
(OFBIZ-9908)
Fixes typos introduced with previous commit
------------------------------------------------------------------------
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 9 15:33:05 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,1857152,1857154,1857173,1857180
+/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,1857152,1857154,1857173,1857180,1857213
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=1857214&r1=1857213&r2=1857214&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
Tue Apr 9 15:33:05 2019
@@ -375,7 +375,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, 90, true););
+ Map<String, Object> newListResult =
dispatcher.runSync("createShoppingList", listFields, 90, true);
if (ServiceUtil.isError(newListResult)) {
String errorMessage =
ServiceUtil.getErrorMessage(newListResult);
Debug.logError(errorMessage, module);
@@ -655,7 +655,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, 90, true););
+ Map<String, Object> newListResult =
dispatcher.runSync("createShoppingList", listFields, 90, true);
if (ServiceUtil.isError(newListResult)) {
String errorMessage =
ServiceUtil.getErrorMessage(newListResult);
Debug.logError(errorMessage, module);
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1857214&r1=1857213&r2=1857214&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
Tue Apr 9 15:33:05 2019
@@ -291,7 +291,7 @@ public class ShoppingListServices {
Map<String, Object> newListResult = null;
try {
- newListResult = dispatcher.runSync("createShoppingList",
serviceCtx, 90, true););
+ 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));
