svn commit: r1713989 - in /ofbiz/trunk: applications/order/webapp/orde
Locked
svn commit: r1713989 - in /ofbiz/trunk: applications/order/webapp/orde
 
|
Author: jleroux
Date: Thu Nov 12 09:32:13 2015 New Revision: 1713989 URL: http://svn.apache.org/viewvc?rev=1713989&view=rev Log: No functional change, completes r1713985 ("Remove superfluous .properties extension from EntityUtilProperties requests" https://issues.apache.org/jira/browse/OFBIZ-6719) for groovy files (nothing left elsewhere) Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy Thu Nov 12 09:32:13 2015 @@ -77,7 +77,7 @@ cart = ShoppingCartEvents.getCartObject( // set currency format currencyUomId = null; if (cart) currencyUomId = cart.getCurrency(); -if (!currencyUomId) currencyUomId = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator); +if (!currencyUomId) currencyUomId = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD", delegator); // get the shopping lists for the user (if logged in) if (userLogin) { Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Thu Nov 12 09:32:13 2015 @@ -119,7 +119,7 @@ if (!partyId) { if (fromPartyId) { partyId = fromPartyId; } else { - partyId = EntityUtilProperties.getPropertyValue("general.properties", "ORGANIZATION_PARTY", delegator); + partyId = EntityUtilProperties.getPropertyValue("general", "ORGANIZATION_PARTY", delegator); } } Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy Thu Nov 12 09:32:13 2015 @@ -180,6 +180,6 @@ if (facility) { defaultWeightUomId = facility.defaultWeightUomId; } if (!defaultWeightUomId) { - defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", "WT_kg", delegator); + defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment", "shipment.default.weight.uom", "WT_kg", delegator); } context.defaultWeightUomId = defaultWeightUomId; Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy Thu Nov 12 09:32:13 2015 @@ -66,7 +66,7 @@ if (shipmentId) { context.shipmentId = shipmentId; weightUoms = from("Uom").where("uomTypeId", "WEIGHT_MEASURE").orderBy("description").queryList(); - defaultWeightUom = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", delegator); + defaultWeightUom = EntityUtilProperties.getPropertyValue("shipment", "shipment.default.weight.uom", delegator); if (defaultWeightUom) { defaultWeight = from("Uom").where("uomId", defaultWeightUom).queryOne(); if (defaultWeight) { Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy Thu Nov 12 09:32:13 2015 @@ -190,7 +190,7 @@ if (facility) { defaultDimensionUomId = facility.defaultDimensionUomId; } if (!defaultDimensionUomId) { - defaultDimensionUomId = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.dimension.uom", "LEN_in", delegator); + defaultDimensionUomId = EntityUtilProperties.getPropertyValue("shipment", "shipment.default.dimension.uom", "LEN_in", delegator); } context.defaultDimensionUomId = defaultDimensionUomId; @@ -199,6 +199,6 @@ if (facility) { defaultWeightUomId = facility.defaultWeightUomId; } if (!defaultWeightUomId) { - defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", "WT_kg", delegator); + defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment", "shipment.default.weight.uom", "WT_kg", delegator); } context.defaultWeightUomId = defaultWeightUomId; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy Thu Nov 12 09:32:13 2015 @@ -123,7 +123,7 @@ context.viewIndexNext = viewIndex+1; try { viewSize = Integer.valueOf((String)parameters.get("VIEW_SIZE")).intValue(); } catch (NumberFormatException nfe) { - viewSize = Integer.valueOf(EntityUtilProperties.getPropertyValue("widget.properties", "widget.form.defaultViewSize", delegator)).intValue(); + viewSize = Integer.valueOf(EntityUtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", delegator)).intValue(); } context.viewSize = viewSize; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy Thu Nov 12 09:32:13 2015 @@ -477,7 +477,7 @@ if (selectedService) { if (showWsdl?.equals("true")) { try { - wsdl = curServiceModel.toWSDL("http://${request.getServerName()}:${EntityUtilProperties.getPropertyValue("url.properties", "port.http", "80", delegator)}${parameters._CONTROL_PATH_}/SOAPService"); + wsdl = curServiceModel.toWSDL("http://${request.getServerName()}:${EntityUtilProperties.getPropertyValue("url", "port.http", "80", delegator)}${parameters._CONTROL_PATH_}/SOAPService"); curServiceMap.wsdl = UtilXml.writeXmlDocument(wsdl); } catch (WSDLException ex) { curServiceMap.wsdl = ex.getLocalizedMessage(); Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy Thu Nov 12 09:32:13 2015 @@ -29,9 +29,9 @@ import org.ofbiz.content.content.*; import org.apache.commons.lang.StringEscapeUtils; import org.ofbiz.entity.util.EntityUtilProperties; -int minFontSize = Integer.parseInt(EntityUtilProperties.getPropertyValue("ecommerce.properties", "tagcloud.min.fontsize", delegator)); -int maxFontSize = Integer.parseInt(EntityUtilProperties.getPropertyValue("ecommerce.properties", "tagcloud.max.fontsize", delegator)); -int limitTagCloud = Integer.parseInt(EntityUtilProperties.getPropertyValue("ecommerce.properties", "tagcloud.limit", delegator)); +int minFontSize = Integer.parseInt(EntityUtilProperties.getPropertyValue("ecommerce", "tagcloud.min.fontsize", delegator)); +int maxFontSize = Integer.parseInt(EntityUtilProperties.getPropertyValue("ecommerce", "tagcloud.max.fontsize", delegator)); +int limitTagCloud = Integer.parseInt(EntityUtilProperties.getPropertyValue("ecommerce", "tagcloud.limit", delegator)); tagCloudList = [] as LinkedList; tagList = [] as LinkedList; Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy?rev=1713989&r1=1713988&r2=1713989&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy (original) +++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy Thu Nov 12 09:32:13 2015 @@ -19,27 +19,27 @@ import org.ofbiz.entity.util.EntityUtilProperties configList = [] -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStoreId", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStoreId", delegator) productStoreIds = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.option.outOfStock", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.option.outOfStock", delegator) outOfStock = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.option.backInStock", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.option.backInStock", delegator) backInStock = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.webSiteUrl", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.webSiteUrl", delegator) webSiteUrl = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.actionType", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.actionType", delegator) actionType = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.statusId", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.statusId", delegator) statusId = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.testMode", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.testMode", delegator) testMode = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.webSiteMountPoint", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.webSiteMountPoint", delegator) webSiteMountPoint = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.countryCode", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.countryCode", delegator) countryCode = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.trackingCodeId", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.trackingCodeId", delegator) trackingCodeId = str.split(",") -str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase.properties", "autoUpdateGoogleBase.productStore.allowRecommended", delegator) +str = EntityUtilProperties.getPropertyValue("autoUpdateToGoogleBase", "autoUpdateGoogleBase.productStore.allowRecommended", delegator) allowRecommended = str.split(",") productStoreIds.eachWithIndex{ productStoreId, i -> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |