Author: jleroux
Date: Mon Oct 14 12:20:01 2013
New Revision: 1531874

URL: http://svn.apache.org/r1531874
Log:
Avoids fixed view sizes and provides default value in case of missing property

Modified:
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy
    
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
    
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
    
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy
    
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy?rev=1531874&r1=1531873&r2=1531874&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy
 Mon Oct 14 12:20:01 2013
@@ -68,7 +68,7 @@ context.paramList = paramList;
 
 // set the page parameters
 viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 0);
-viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 20);
+viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", 20));
 listSize = 0;
 if (inventoryList)
     listSize = inventoryList.size();

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy?rev=1531874&r1=1531873&r2=1531874&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
 (original)
+++ 
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
 Mon Oct 14 12:20:01 2013
@@ -150,7 +150,7 @@ viewIndex = request.getParameter("viewIn
 context.viewIndex = viewIndex;
 
 viewSize = request.getParameter("viewSize") ? 
Integer.valueOf(request.getParameter("viewSize")) : 
-                                                                
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize");
+                                                                
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", 20);
 context.viewSize = viewSize;
 
 // get the lookup flag

Modified: 
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy?rev=1531874&r1=1531873&r2=1531874&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
 (original)
+++ 
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
 Mon Oct 14 12:20:01 2013
@@ -103,7 +103,7 @@ if (shoppingListId) {
             context.shoppingListItemDatas = shoppingListItemDatas;
             // pagination for the shopping list
             viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 0);
-            viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 20);
+            viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", 20));
             listSize = 0;
             if (shoppingListItemDatas)
                 listSize = shoppingListItemDatas.size();

Modified: 
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy?rev=1531874&r1=1531873&r2=1531874&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy
 (original)
+++ 
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy
 Mon Oct 14 12:20:01 2013
@@ -42,7 +42,7 @@ try {
     beganTransaction = TransactionUtil.begin();
 
     viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 1);
-    viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize"));
+    viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", 20));
     context.viewIndex = viewIndex;
     context.viewSize = viewSize;
 

Modified: 
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy?rev=1531874&r1=1531873&r2=1531874&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy
 (original)
+++ 
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy
 Mon Oct 14 12:20:01 2013
@@ -40,7 +40,7 @@ maxDate = parameters.maxDate;
 
 // set the page parameters
 viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 0);
-viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize"));
+viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", 20));
 context.viewIndex = viewIndex;
 context.viewSize = viewSize;
 

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy?rev=1531874&r1=1531873&r2=1531874&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
 Mon Oct 14 12:20:01 2013
@@ -139,7 +139,7 @@ if (shoppingListId) {
             context.shoppingListItemDatas = shoppingListItemDatas;
             // pagination for the shopping list
             viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 1);
-            viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 20);
+            viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 
UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", 20));
             listSize = 0;
             if (shoppingListItemDatas)
                 listSize = shoppingListItemDatas.size();


Reply via email to