svn commit: r1830854 - in /ofbiz/branches/release16.11: applications/manufacturing/groovyScripts/mrp/ applications/party/groovyScripts/party/ applications/party/groovyScripts/visit/ specialpurpose/ecommerce/groovyScripts/shoppinglist/

[Deepak Dixit-5]

Author: deepak
Date: Thu May  3 18:26:51 2018
New Revision: 1830854

URL: http://svn.apache.org/viewvc?rev=1830854&view=rev
Log:
Fixed: The viewSize should be converted Integer for multiplication
(OFBIZ-10392)
Thanks  Schumann Ye for your contribution, This has been already fixed in 17.12 at r#1792020 by zhangwei

Modified:
    ofbiz/branches/release16.11/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy
    ofbiz/branches/release16.11/applications/party/groovyScripts/party/EditShoppingList.groovy
    ofbiz/branches/release16.11/applications/party/groovyScripts/visit/ShowVisits.groovy
    ofbiz/branches/release16.11/specialpurpose/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy

Modified: ofbiz/branches/release16.11/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy?rev=1830854&r1=1830853&r2=1830854&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy (original)
+++ ofbiz/branches/release16.11/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy Thu May  3 18:26:51 2018
@@ -69,7 +69,7 @@ context.paramList = paramList
 
 // set the page parameters
 viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 0)
-viewSize = parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
+viewSize = parameters.VIEW_SIZE ? Integer.valueOf(parameters.VIEW_SIZE): EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
 listSize = 0
 if (inventoryList)
     listSize = inventoryList.size()

Modified: ofbiz/branches/release16.11/applications/party/groovyScripts/party/EditShoppingList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/groovyScripts/party/EditShoppingList.groovy?rev=1830854&r1=1830853&r2=1830854&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/groovyScripts/party/EditShoppingList.groovy (original)
+++ ofbiz/branches/release16.11/applications/party/groovyScripts/party/EditShoppingList.groovy Thu May  3 18:26:51 2018
@@ -104,7 +104,7 @@ if (shoppingListId) {
             context.shoppingListItemDatas = shoppingListItemDatas
             // pagination for the shopping list
             viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 0)
-            viewSize = parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
+            viewSize = parameters.VIEW_SIZE ? Integer.valueOf(parameters.VIEW_SIZE): EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
             listSize = shoppingListItemDatas ? shoppingListItemDatas.size() : 0
 
             lowIndex = (viewIndex * viewSize) + 1

Modified: ofbiz/branches/release16.11/applications/party/groovyScripts/visit/ShowVisits.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/groovyScripts/visit/ShowVisits.groovy?rev=1830854&r1=1830853&r2=1830854&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/groovyScripts/visit/ShowVisits.groovy (original)
+++ ofbiz/branches/release16.11/applications/party/groovyScripts/visit/ShowVisits.groovy Thu May  3 18:26:51 2018
@@ -41,7 +41,7 @@ try {
     beganTransaction = TransactionUtil.begin()
 
     viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 1)
-    viewSize = parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
+    viewSize = parameters.VIEW_SIZE ? Integer.valueOf(parameters.VIEW_SIZE): EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
     context.viewIndex = viewIndex
     context.viewSize = viewSize
 

Modified: ofbiz/branches/release16.11/specialpurpose/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy?rev=1830854&r1=1830853&r2=1830854&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy (original)
+++ ofbiz/branches/release16.11/specialpurpose/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy Thu May  3 18:26:51 2018
@@ -142,7 +142,7 @@ if (shoppingListId) {
             context.shoppingListItemDatas = shoppingListItemDatas
             // pagination for the shopping list
             viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 1)
-            viewSize = parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
+            viewSize = parameters.VIEW_SIZE ? Integer.valueOf(parameters.VIEW_SIZE): EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
             listSize = shoppingListItemDatas ? shoppingListItemDatas.size() : 0
 
             lowIndex = ((viewIndex - 1) * viewSize) + 1