You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/06/14 03:03:19 UTC
svn commit: r667713 - in /ofbiz/trunk/applications:
manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/
party/webapp/partymgr/WEB-INF/actions/communication/
party/webapp/partymgr/WEB-INF/actions/visit/
product/webapp/catalog/WEB-INF/actions/config/...
Author: hansbak
Date: Fri Jun 13 18:03:19 2008
New Revision: 667713
URL: http://svn.apache.org/viewvc?rev=667713&view=rev
Log:
improoved on scotts viewsize defnition, now taking from widget property, removed unused groovy file
Removed:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/PendingCommunications.groovy
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.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=667713&r1=667712&r2=667713&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 Fri Jun 13 18:03:19 2008
@@ -66,14 +66,8 @@
context.paramList = paramList;
// set the page parameters
-viewIndex = 0;
-try {
- viewIndex = Integer.valueOf((String) parameters.VIEW_INDEX).intValue();
-} catch (Exception e) {}
-viewSize = 100;
-try {
- viewSize = Integer.valueOf((String) parameters.VIEW_SIZE).intValue();
-} catch (Exception e) {}
+viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 0);
+viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 20);
listSize = 0;
if (inventoryList)
listSize = inventoryList.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=667713&r1=667712&r2=667713&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 Fri Jun 13 18:03:19 2008
@@ -20,6 +20,7 @@
import org.ofbiz.entity.util.EntityFindOptions;
import org.ofbiz.entity.condition.*;
import org.ofbiz.entity.transaction.TransactionUtil;
+import org.ofbiz.base.util.*
module = "showvisits.bsh";
@@ -49,20 +50,9 @@
visitListIt = delegator.find("Visit", EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), null, null, sortList, new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true));
}
- viewIndex = 1;
- viewSize = 20;
- try {
- viewIndex = Integer.valueOf((String) parameters.VIEW_INDEX).intValue();
- } catch (Exception e) {
- viewIndex = 1;
- }
+ viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 1);
+ viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize"));
context.viewIndex = viewIndex;
-
- try {
- viewSize = Integer.valueOf((String) parameters.VIEW_SIZE).intValue();
- } catch (Exception e) {
- viewSize = 20;
- }
context.viewSize = viewSize;
// get the indexes for the partial list
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy?rev=667713&r1=667712&r2=667713&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy Fri Jun 13 18:03:19 2008
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
+import org.ofbiz.base.util.*
itemsList = delegator.findList("ProductConfigItem", null, null, ['configItemId'], null, false);
context.itemsList = itemsList;
// 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"));
listSize = itemsList.size();
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=667713&r1=667712&r2=667713&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 Fri Jun 13 18:03:19 2008
@@ -23,6 +23,8 @@
import org.ofbiz.entity.util.*
import org.ofbiz.entity.condition.*
import org.ofbiz.entity.transaction.*
+import org.ofbiz.base.util.*
+
delegator = request.getAttribute("delegator");
@@ -35,20 +37,9 @@
maxDate = request.getParameter("maxDate");
// set the page parameters
-viewIndex = 1;
-try {
- viewIndex = Integer.valueOf((String) request.getParameter("VIEW_INDEX")).intValue();
-} catch (Exception e) {
- viewIndex = 1;
-}
+viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 0);
+viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize"));
context.viewIndex = viewIndex;
-
-viewSize = 20;
-try {
- viewSize = Integer.valueOf((String) request.getParameter("VIEW_SIZE")).intValue();
-} catch (Exception e) {
- viewSize = 20;
-}
context.viewSize = viewSize;
findShipmentExprs = [] as LinkedList;