Author: zhangwei
Date: Thu Apr 20 07:25:58 2017
New Revision: 1792020
URL:
http://svn.apache.org/viewvc?rev=1792020&view=revLog:
The viewSize should be converted Integer for multiplication
Modified:
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy
ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy
ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy?rev=1792020&r1=1792019&r2=1792020&view=diff==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy Thu Apr 20 07:25:58 2017
@@ -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/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy?rev=1792020&r1=1792019&r2=1792020&view=diff==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy Thu Apr 20 07:25:58 2017
@@ -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/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy?rev=1792020&r1=1792019&r2=1792020&view=diff==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy Thu Apr 20 07:25:58 2017
@@ -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