Author: jleroux
Date: Sun May 26 10:36:16 2019
New Revision: 1860051
URL: http://svn.apache.org/viewvc?rev=1860051&view=rev
Log:
Improved: Use Groovy Truth instead of UtilValidate Class in Groovy
(OFBIZ-11064)
As we all know, Groovy is a powerful language with great built-in functions.
Groovy Truth[1] is one of them, which is not used properly in our code base.
We have used UtilValidate Class to validate arguments for Empty or NotEmpty,
which can easily be done in groovy with built-in functionality[1].
Current Code: if (UtilValidate.isNotEmpty(locations)) { ... }
Groovy Built-in Code: if (locations) { ... }
[1] - http://groovy-lang.org/semantics.html#Groovy-Truth
We need to careful for some points while we change this:
Like:
maxRetry = 0
if (!maxRetry)
{ // Not set, use a default maxRetry = -1 }
Because groovy evaluates zero to be false, it wouldn't be possible to set
maxRetry to zero. So it's best not to use groovy truth for null-checks on
numbers in some cases.
Thanks: Pawan Verma
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy
ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/lookup/LookupAssociatedProducts.groovy
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy
ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/PartyGeoLocation.groovy
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/PrepareCreateShipMeth.groovy
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/category/EditCategoryContentContent.groovy
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/product/EditProductAssoc.groovy
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/inventory/InventoryAverageCosts.groovy
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Days.groovy
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Month.groovy
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Week.groovy
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/artifactinfo/ComponentList.groovy
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ProgramExport.groovy
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
ofbiz/ofbiz-plugins/trunk/birt/groovyScripts/order/CheckReportBy.groovy
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/AjaxBreadcrumbs.groovy
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/BestSellingCategory.groovy
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/PopularTags.groovy
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/order/OrderStatus.groovy
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
ofbiz/ofbiz-plugins/trunk/multiflex/webapp/multiflex/style.css
ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GanttChart.groovy
ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GetProjectId.groovy
ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/FindProductBacklogItem.groovy
ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ListCurrentProducts.groovy
ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ProductEmail.groovy
ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/cart/ShowCart.groovy
ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/search/CustomerAddress.groovy
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy
Sun May 26 10:36:16 2019
@@ -68,7 +68,7 @@ if ("Y".equals(parameters.noConditionFin
if (creditCard.cardType == cardType) {
paymentListWithCreditCard.add(payment)
}
- } else if (UtilValidate.isEmpty(cardType)) {
+ } else if (!cardType) {
paymentListWithoutCreditCard.add(payment)
}
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy
Sun May 26 10:36:16 2019
@@ -57,7 +57,7 @@ if ("Y".equals(parameters.noConditionFin
if (creditCard.cardType == cardType) {
paymentListWithCreditCard.add(payment)
}
- } else if (UtilValidate.isEmpty(cardType)) {
+ } else if (!cardType) {
paymentListWithoutCreditCard.add(payment)
}
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy
Sun May 26 10:36:16 2019
@@ -29,7 +29,7 @@ if (parameters.get('ApplicationDecorator
onlyIncludePeriodTypeIdList.add("FISCAL_YEAR")
customTimePeriodResults = runService('findCustomTimePeriods', [findDate :
UtilDateTime.nowTimestamp(), organizationPartyId :
parameters.get('ApplicationDecorator|organizationPartyId'),
onlyIncludePeriodTypeIdList : onlyIncludePeriodTypeIdList, userLogin :
userLogin])
customTimePeriodList = customTimePeriodResults.customTimePeriodList
- if (UtilValidate.isNotEmpty(customTimePeriodList)) {
+ if (customTimePeriodList) {
context.timePeriod = customTimePeriodList.first().customTimePeriodId
}
decimals = UtilNumber.getBigDecimalScale("ledger.decimals")
@@ -49,7 +49,7 @@ if (parameters.get('ApplicationDecorator
currentTimePeriod =
from("CustomTimePeriod").where("customTimePeriodId",
parameters.timePeriod).queryOne()
previousTimePeriodResult = runService('getPreviousTimePeriod',
[customTimePeriodId : parameters.timePeriod, userLogin : userLogin])
previousTimePeriod = previousTimePeriodResult.previousTimePeriod
- if (UtilValidate.isNotEmpty(previousTimePeriod)) {
+ if (previousTimePeriod) {
glAccountHistory =
from("GlAccountHistory").where("customTimePeriodId",
previousTimePeriod.customTimePeriodId, "glAccountId", parameters.glAccountId,
"organizationPartyId",
parameters.get('ApplicationDecorator|organizationPartyId')).queryOne()
if (glAccountHistory && glAccountHistory.endingBalance != null) {
context.openingBalance = glAccountHistory.endingBalance
Modified:
ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy
Sun May 26 10:36:16 2019
@@ -29,18 +29,18 @@
if(productStore){
context.productStoreId = productStore.productStoreId
}
- if(UtilValidate.isEmpty(productStore)){
+ if(!productStore){
errMsgList.add("Product Store not set!")
showScreen = "message"
} else {
facility =from("Facility").where("facilityId",
productStore.inventoryFacilityId).queryOne();
webSite = from("WebSite").where("productStoreId",
productStore.productStoreId).queryFirst();
- if(UtilValidate.isEmpty(facility)){
+ if(!facility){
errMsgList.add("Facility not set!")
showScreen = "message"
}
- if(UtilValidate.isEmpty(webSite)){
+ if(!webSite){
errMsgList.add("WebSite not set!")
showScreen = "message"
}
@@ -64,7 +64,7 @@
productCategoryId = parameters.productCategoryId
showErrorMsg = "N"
- if(UtilValidate.isEmpty(prodCatalogId)){
+ if(!prodCatalogId){
errMsgList.add("Product Catalog not set!")
showErrorMsg = "Y"
}
@@ -83,7 +83,7 @@
productId = parameters.productId
product = null
- if(UtilValidate.isEmpty(productCategoryId)){
+ if(!productCategoryId){
errMsgList.add("Product Category not set!")
showErrorMsg = "Y"
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy
Sun May 26 10:36:16 2019
@@ -26,20 +26,20 @@ import org.apache.ofbiz.base.util.UtilVa
delegator = request.getAttribute("delegator")
productionRunId = request.getParameter("productionRunId")
-if (UtilValidate.isEmpty(productionRunId)) {
+if (!productionRunId) {
productionRunId = request.getParameter("workEffortId")
}
-if (UtilValidate.isNotEmpty(productionRunId)) {
+if (productionRunId) {
GenericValue productionRun = from("WorkEffort").where("workEffortId",
productionRunId).queryOne();
- if (UtilValidate.isNotEmpty(productionRun)) {
+ if (productionRun) {
// If this is a task, get the parent production run
if (productionRun.getString("workEffortTypeId") != null &&
"PROD_ORDER_TASK".equals(productionRun.getString("workEffortTypeId"))) {
productionRun = from("WorkEffort").where("workEffortId",
productionRun.getString("workEffortParentId")).queryOne();
}
}
- if (UtilValidate.isEmpty(productionRun)) {
+ if (!productionRun) {
return "error"
}
if ("PRUN_CREATED".equals(productionRun.getString("currentStatusId")) ||
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy
Sun May 26 10:36:16 2019
@@ -29,13 +29,13 @@ if (productStoreId == null) {
giftCardCategories = from("ProductCategory").where("productCategoryTypeId",
"GIFT_CARD_CATEGORY").queryList()
giftCardProductList = []
-if (UtilValidate.isNotEmpty(giftCardCategories)) {
+if (giftCardCategories) {
giftCardCategories.each { giftCardCategory ->
giftCardCategoryMembers =
from("ProductCategoryMember").where("productCategoryId",
giftCardCategory.productCategoryId).queryList()
- if (UtilValidate.isNotEmpty(giftCardCategoryMembers)) {
+ if (giftCardCategoryMembers) {
giftCardCategoryMembers.each { giftCardCategoryMember ->
giftCardProducts =
from("ProductAndPriceView").where("productId",
giftCardCategoryMember.productId).queryList()
- if (UtilValidate.isNotEmpty(giftCardProducts)) {
+ if (giftCardProducts) {
giftCardProducts.each { giftCardProduct ->
giftCardProductList.add(giftCardProduct)
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy
Sun May 26 10:36:16 2019
@@ -96,9 +96,9 @@ if ("SALES_ORDER".equals(cart.getOrderTy
facilities = from("Facility").where("ownerPartyId",
companyId).cache(true).queryList()
// if facilites is null then check the PartyRelationship where there
is a relationship set for Parent & Child organization. Then also fetch the
value of companyId from there.
- if (UtilValidate.isEmpty(facilities)) {
+ if (!facilities) {
partyRelationship =
from("PartyRelationship").where("roleTypeIdFrom": "PARENT_ORGANIZATION",
"partyIdTo": companyId).queryFirst()
- if (UtilValidate.isNotEmpty(partyRelationship)) {
+ if (partyRelationship) {
companyId = partyRelationship.partyIdFrom
facilities = from("Facility").where("ownerPartyId",
companyId).cache(true).queryList()
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy
Sun May 26 10:36:16 2019
@@ -91,7 +91,7 @@ context.put("contentPathPrefix", content
// little routine to see if any members have a quantity > 0 assigned
members = context.get("productCategoryMembers")
-if (UtilValidate.isNotEmpty(members)) {
+if (members) {
for (i = 0; i < members.size(); i++) {
productCategoryMember = (GenericValue) members.get(i)
if (productCategoryMember.get("quantity") != null &&
productCategoryMember.getDouble("quantity").doubleValue() > 0.0) {
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy
Sun May 26 10:36:16 2019
@@ -428,7 +428,7 @@ if (product) {
break
}
}
- } else if
(UtilValidate.isNotEmpty(entry.getValue())) {
+ } else if (entry.getValue()) {
if
(variant.get("productId").equals(entry.getValue().get(0))) {
variantPriceMap.put("variantName",
entry.getKey())
break
@@ -472,7 +472,7 @@ if (product) {
break
}
}
- } else if
(UtilValidate.isNotEmpty(entry.getValue())) {
+ } else if (entry.getValue()) {
if
(virtual.get("productId").equals(entry.getValue().get(0))) {
virtualPriceMap.put("variantName", entry.getKey())
break
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/lookup/LookupAssociatedProducts.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/lookup/LookupAssociatedProducts.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/lookup/LookupAssociatedProducts.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/lookup/LookupAssociatedProducts.groovy
Sun May 26 10:36:16 2019
@@ -27,10 +27,10 @@ productId = request.getParameter("produc
if (productId != null) {
product = from("Product").where("productId", productId).queryOne()
prodAssocs = product.getRelated("MainProductAssoc", null, null, false)
- if (UtilValidate.isNotEmpty(prodAssocs)) {
+ if (prodAssocs) {
products = EntityUtil.filterByAnd(prodAssocs,
[EntityCondition.makeCondition("productAssocTypeId", EntityOperator.NOT_EQUAL,
"PRODUCT_VARIANT")])
- if (UtilValidate.isNotEmpty(products)) {
+ if (products) {
productList = []
products.each { product ->
if (product != null) {
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy
Sun May 26 10:36:16 2019
@@ -217,7 +217,7 @@ if (orderHeader) {
BigDecimal quantityNotAvailable = 0
List<GenericValue> oisgirs =
orderItem.getRelated("OrderItemShipGrpInvRes", null, null, false)
for (GenericValue oisgir : oisgirs) {
- if (UtilValidate.isNotEmpty(oisgir.get("quantityNotAvailable"))) {
+ if (oisgir.get("quantityNotAvailable")) {
quantityNotAvailable =
quantityNotAvailable.add(oisgir.getBigDecimal("quantityNotAvailable"))
}
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/PartyGeoLocation.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/PartyGeoLocation.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/PartyGeoLocation.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/PartyGeoLocation.groovy
Sun May 26 10:36:16 2019
@@ -47,7 +47,7 @@ if (latestGeoPoint) {
List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat",
latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13"))
- if (UtilValidate.isNotEmpty(latestGeoPoint) &&
latestGeoPoint.containsKey("latitude") &&
latestGeoPoint.containsKey("longitude")) {
+ if (latestGeoPoint && latestGeoPoint.containsKey("latitude") &&
latestGeoPoint.containsKey("longitude")) {
List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat",
latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "partyId", partyId,
"link", UtilMisc.toMap("url", "viewprofile?partyId="+ partyId,
"label", uiLabelMap.PartyProfile + " " + uiLabelMap.CommonOf + " " + partyId)))
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/PrepareCreateShipMeth.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/PrepareCreateShipMeth.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/PrepareCreateShipMeth.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/PrepareCreateShipMeth.groovy
Sun May 26 10:36:16 2019
@@ -21,7 +21,7 @@ import java.util.StringTokenizer
import org.apache.ofbiz.base.util.UtilValidate
String carrierShipmentString = request.getParameter("carrierShipmentString")
-if (UtilValidate.isNotEmpty(carrierShipmentString)) {
+if (carrierShipmentString) {
StringTokenizer st = new StringTokenizer(carrierShipmentString, "|")
if (st.countTokens() != 3) {
return "error"
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/category/EditCategoryContentContent.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/category/EditCategoryContentContent.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/category/EditCategoryContentContent.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/category/EditCategoryContentContent.groovy
Sun May 26 10:36:16 2019
@@ -50,7 +50,7 @@ if ("RELATED_URL".equals(prodCatContentT
context.contentFormName = "EditCategoryContentRelatedUrl"
context.contentFormTitle =
"${uiLabelMap.ProductUpdateRelatedURLContentCategory}"
}else if ("VIDEO".equals(prodCatContentTypeId) ||
"CATEGORY_IMAGE".equals(prodCatContentTypeId)) {
- if (UtilValidate.isNotEmpty(content)) {
+ if (content) {
context.fileDataResourceId = content.dataResourceId
}
if("CATEGORY_IMAGE".equals(prodCatContentTypeId)){
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy
Sun May 26 10:36:16 2019
@@ -23,7 +23,7 @@ import org.apache.ofbiz.base.util.UtilVa
frameContentId = null
frameDataResourceId = null
-if (UtilValidate.isNotEmpty(session.getAttribute("frameContentId")) &&
UtilValidate.isNotEmpty(session.getAttribute("frameDataResourceId"))) {
+if ((session.getAttribute("frameContentId")) &&
(session.getAttribute("frameDataResourceId")) {
frameContentId = session.getAttribute("frameContentId")
frameDataResourceId = session.getAttribute("frameDataResourceId")
} else {
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/product/EditProductAssoc.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/product/EditProductAssoc.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/product/EditProductAssoc.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/catalog/product/EditProductAssoc.groovy
Sun May 26 10:36:16 2019
@@ -25,7 +25,7 @@ uiLabelMap = UtilProperties.getResourceB
product = from("Product").where("productId", parameters.productId).queryOne()
fromDate = UtilDateTime.nowTimestamp()
-if (UtilValidate.isNotEmpty(parameters.fromDate)) {
+if (parameters.fromDate) {
fromDate = ObjectType.simpleTypeOrObjectConvert(parameters.fromDate,
"Timestamp", null, timeZone, locale, false)
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy
Sun May 26 10:36:16 2019
@@ -33,7 +33,7 @@ if (facilityId && locationSeqId) {
List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat",
latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13"))
- if (UtilValidate.isNotEmpty(latestGeoPoint) &&
latestGeoPoint.containsKey("latitude") &&
latestGeoPoint.containsKey("longitude")) {
+ if (latestGeoPoint && latestGeoPoint.containsKey("latitude") &&
latestGeoPoint.containsKey("longitude")) {
List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat",
latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "facilityId",
facilityId,
"link", UtilMisc.toMap("url",
"EditFacilityLocation?facilityId="+ facilityId + "&locationSeqId=" +
locationSeqId,
"label", uiLabelMap.ProductFacilityLocation + " " +
uiLabelMap.CommonOf + " " + facilityId + "/" + locationSeqId)))
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/inventory/InventoryAverageCosts.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/inventory/InventoryAverageCosts.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/inventory/InventoryAverageCosts.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/inventory/InventoryAverageCosts.groovy
Sun May 26 10:36:16 2019
@@ -34,7 +34,7 @@ inventoryItemProducts = EntityUtil.getFi
inventoryAverageCosts = []
inventoryItemProducts.each { productId ->
productFacility = from("ProductFacility").where("productId", productId,
"facilityId", facilityId).queryOne()
- if (UtilValidate.isNotEmpty(productFacility)) {
+ if (productFacility) {
result = runService('calculateProductAverageCost',
UtilMisc.toMap("productId": productId, "facilityId": facilityId, "userLogin":
userLogin))
totalQuantityOnHand = result.get("totalQuantityOnHand")
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Days.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Days.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Days.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Days.groovy
Sun May 26 10:36:16 2019
@@ -25,7 +25,7 @@ import org.apache.ofbiz.service.ModelSer
String startParam = parameters.startTime
Timestamp start = null
-if (UtilValidate.isNotEmpty(startParam)) {
+if (startParam) {
start = new Timestamp(Long.parseLong(startParam))
}
if (start == null) {
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Month.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Month.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Month.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Month.groovy
Sun May 26 10:36:16 2019
@@ -25,7 +25,7 @@ import org.apache.ofbiz.service.ModelSer
String startParam = parameters.startTime
Timestamp start = null
-if (UtilValidate.isNotEmpty(startParam)) {
+if (startParam) {
start = new Timestamp(Long.parseLong(startParam))
}
if (start == null) {
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Week.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Week.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Week.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Week.groovy
Sun May 26 10:36:16 2019
@@ -25,7 +25,7 @@ import org.apache.ofbiz.service.ModelSer
String startParam = parameters.startTime
Timestamp start = null
-if (UtilValidate.isNotEmpty(startParam)) {
+if (startParam) {
start = new Timestamp(Long.parseLong(startParam))
}
if (start == null) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/artifactinfo/ComponentList.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/artifactinfo/ComponentList.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/artifactinfo/ComponentList.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/artifactinfo/ComponentList.groovy
Sun May 26 10:36:16 2019
@@ -43,7 +43,7 @@ components.each { component ->
componentMap.location = webApp.getLocation()
componentList.add(componentMap)
}
- if (UtilValidate.isEmpty(webApps)) {
+ if (!webApps) {
componentMap = [:]
componentMap.compName = component.getComponentName()
componentMap.rootLocation = component.getRootLocation()
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
Sun May 26 10:36:16 2019
@@ -66,7 +66,7 @@ if (modelEntity) {
dynamicAutoEntityFieldSearchForm = dynamicAutoEntityFieldSearchForm +
'</form></forms>'
Document dynamicAutoEntityFieldSearchFormXml =
UtilXml.readXmlDocument(dynamicAutoEntityFieldSearchForm, true, true)
Map<String, ModelForm> modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldSearchFormXml,
entityModelReader, dispatcher.getDispatchContext(), entityName)
- if (UtilValidate.isNotEmpty(modelFormMap)) {
+ if (modelFormMap) {
Map.Entry<String, ModelForm> entry =
modelFormMap.entrySet().iterator().next()
modelForm = entry.getValue()
}
@@ -97,7 +97,7 @@ if (modelEntity) {
//Debug.logInfo(dynamicAutoEntityFieldForm, "")
Document dynamicAutoEntityFieldListFormXml =
UtilXml.readXmlDocument(dynamicAutoEntityFieldListForm, true, true)
modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldListFormXml,
entityModelReader, dispatcher.getDispatchContext(), entityName)
- if (UtilValidate.isNotEmpty(modelFormMap)) {
+ if (modelFormMap) {
Map.Entry<String, ModelForm> entry =
modelFormMap.entrySet().iterator().next()
modelForm = entry.getValue()
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ProgramExport.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ProgramExport.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ProgramExport.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ProgramExport.groovy
Sun May 26 10:36:16 2019
@@ -31,7 +31,7 @@ String groovyProgram = null
recordValues = []
errMsgList = []
-if (UtilValidate.isEmpty(parameters.groovyProgram)) {
+if (!parameters.groovyProgram) {
groovyProgram = '''
// Use the List variable recordValues to fill it with GenericValue maps.
@@ -71,7 +71,7 @@ binding.setVariable("recordValues", reco
ClassLoader loader = Thread.currentThread().getContextClassLoader()
def shell = new GroovyShell(loader, binding, configuration)
-if (UtilValidate.isNotEmpty(groovyProgram)) {
+if (groovyProgram) {
try {
shell.parse(groovyProgram)
shell.evaluate(groovyProgram)
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
Sun May 26 10:36:16 2019
@@ -68,7 +68,7 @@ while (pkIterator.hasNext()) {
ModelField field = pkIterator.next()
ModelFieldType type = delegator.getEntityFieldType(entity, field.getType())
String fval = parameters.get(field.getName())
- if (UtilValidate.isNotEmpty(fval)) {
+ if (fval) {
curFindString = curFindString + "&" + field.getName() + "=" + fval
findByPK.setString(field.getName(), fval)
}
Modified:
ofbiz/ofbiz-plugins/trunk/birt/groovyScripts/order/CheckReportBy.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/groovyScripts/order/CheckReportBy.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/groovyScripts/order/CheckReportBy.groovy
(original)
+++ ofbiz/ofbiz-plugins/trunk/birt/groovyScripts/order/CheckReportBy.groovy Sun
May 26 10:36:16 2019
@@ -22,7 +22,7 @@ import org.apache.ofbiz.base.util.UtilVa
reportBy = parameters.reportBy
exportType = parameters.exportType
-if (UtilValidate.isEmpty(parameters.fromDate)) {
+if (!parameters.fromDate) {
request.setAttribute("_ERROR_MESSAGE_", "Please select From Date.")
return "error"
}
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/AjaxBreadcrumbs.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/AjaxBreadcrumbs.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/AjaxBreadcrumbs.groovy
(original)
+++
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/AjaxBreadcrumbs.groovy
Sun May 26 10:36:16 2019
@@ -22,7 +22,7 @@ import org.apache.ofbiz.base.util.UtilVa
parentCategoryStr = parameters.parentCategoryStr
productCategoryId=parameters.category_id
-if(!UtilValidate.isEmpty(parentCategoryStr)) {
+if(parentCategoryStr) {
pathList = parentCategoryStr.split('/')
cateList = []
pathTemp = ''
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/BestSellingCategory.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/BestSellingCategory.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/BestSellingCategory.groovy
(original)
+++
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/BestSellingCategory.groovy
Sun May 26 10:36:16 2019
@@ -25,7 +25,7 @@ import org.apache.ofbiz.product.category
catalogId = CatalogWorker.getCurrentCatalogId(request)
bestSellerCates = []
-if (UtilValidate.isNotEmpty(catalogId)) {
+if (catalogId) {
prodCatalogCategoryList = CatalogWorker.getProdCatalogCategories(request,
catalogId, "PCCT_BEST_SELL")
if (prodCatalogCategoryList.size() > 0) {
for (int i = 0; i < prodCatalogCategoryList.size(); i++) {
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/PopularTags.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/PopularTags.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/PopularTags.groovy
(original)
+++
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/catalog/PopularTags.groovy
Sun May 26 10:36:16 2019
@@ -43,7 +43,7 @@ productKeywords = select("keyword", "key
.distinct(true)
.queryList()
-if (UtilValidate.isNotEmpty(productKeywords)) {
+if (productKeywords) {
productKeywords.each { productKeyword ->
productTags = from("ProductKeyword").where("keyword",
productKeyword.keyword, "keywordTypeId", "KWT_TAG", "statusId",
"KW_APPROVED").queryList()
searchResult = [:]
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/order/OrderStatus.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/order/OrderStatus.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/order/OrderStatus.groovy
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/order/OrderStatus.groovy
Sun May 26 10:36:16 2019
@@ -54,7 +54,7 @@ if (!userLogin) {
} else {
filteredOrderStatusList =
EntityUtil.filterByCondition(orderStatuses,
EntityCondition.makeCondition("statusId", EntityOperator.IN,
["ORDER_COMPLETED", "ORDER_APPROVED"]))
}
- if (UtilValidate.isNotEmpty(filteredOrderStatusList)) {
+ if (filteredOrderStatusList) {
if (filteredOrderStatusList.size() < 2) {
statusUserLogin =
EntityUtil.getFirst(filteredOrderStatusList).statusUserLogin
userLogin = from("UserLogin").where("userLoginId",
statusUserLogin).queryOne()
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
Sun May 26 10:36:16 2019
@@ -1309,7 +1309,7 @@ cursor: default;
.ui-widget-header .ui-icon {background-image:
url(jquery/plugins/elrte-1.3/css/smoothness/images/ui-icons_222222_256x240.png);
}
.ui-state-default .ui-icon { background-image:
url(jquery/plugins/elrte-1.3/css/smoothness/images/ui-icons_888888_256x240.png);
}
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image:
url(jquery/plugins/elrte-1.3/css/smoothness/images/ui-icons_454545_256x240.png);
}
-.ui-state-active .ui-icon {background-image:
url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image:
url(/images/ui-icons_454545_256x240.png); }
.ui-state-highlight .ui-icon {background-image:
url(jquery/plugins/elrte-1.3/css/smoothness/images/ui-icons_2e83ff_256x240.png);
}
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image:
url(jquery/plugins/elrte-1.3/css/smoothness/images/ui-icons_cd0a0a_256x240.png);
}
@@ -1506,7 +1506,7 @@ cursor: default;
.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px;
border-radius: 4px; }
/* Overlays */
-.ui-widget-overlay { background: #aaaaaa
url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity:
.30;filter:Alpha(Opacity=30); }
+.ui-widget-overlay { background: #aaaaaa
url(/images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity:
.30;filter:Alpha(Opacity=30); }
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa
url(jquery/plugins/elrte-1.3/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png)
50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius:
8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
* jQuery UI Resizable @VERSION
*
Modified: ofbiz/ofbiz-plugins/trunk/multiflex/webapp/multiflex/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/multiflex/webapp/multiflex/style.css?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/multiflex/webapp/multiflex/style.css (original)
+++ ofbiz/ofbiz-plugins/trunk/multiflex/webapp/multiflex/style.css Sun May 26
10:36:16 2019
@@ -56,7 +56,7 @@ body {
background: none!important;
}
#ecom-mainarea .card .card-header {
- background: #DCDCDC url(images/bg_head_bottom_nav.jpg) no-repeat;
+ background: #DCDCDC url(/images/bg_head_bottom_nav.jpg) no-repeat;
}
div.popup {
max-width: 1200px;
@@ -71,7 +71,7 @@ div.popup {
clear: both;
width: 900px;
padding-bottom: 30px;
- background: transparent url(images/bg_main_withnav.jpg) top left repeat-y;
+ background: transparent url(/images/bg_main_withnav.jpg) top left repeat-y;
}
.left {
@@ -104,7 +104,7 @@ div.popup {
footer {
clear: both;
padding: 1.0em 0 1.0em 0;
- background: rgb(225, 225, 225) url(images/bg_foot.jpg) no-repeat;
+ background: rgb(225, 225, 225) url(/images/bg_foot.jpg) no-repeat;
background-size: 100% 50px;
font-size: 1.0em;
overflow: visible !important /*Firefox*/;
@@ -129,7 +129,7 @@ footer {
.header-middle {
width: 100%;
height: auto;
- background: #E6E6E6 url(images/bg_head_middle.jpg);
+ background: #E6E6E6 url(/images/bg_head_middle.jpg);
overflow: visible !important /*Firefox*/;
overflow: hidden /*IE6*/;
background-size: cover;
@@ -153,7 +153,7 @@ footer {
.header-bottom {
width: 100%;
height: auto;
- background: #FFFFFF url(images/bg_head_breadcrumbs.jpg) repeat-y;
+ background: #FFFFFF url(/images/bg_head_breadcrumbs.jpg) repeat-y;
margin-bottom: 15px;
}
@@ -162,7 +162,7 @@ footer {
width: 100%;
height: auto;
padding: 1.0em 0 1.0em 0;
- background: #FFFFFF url(images/bg_head_breadcrumbs.jpg) repeat-y;
+ background: #FFFFFF url(/images/bg_head_breadcrumbs.jpg) repeat-y;
}
.sitelogo {
@@ -171,7 +171,7 @@ footer {
position: absolute;
z-index: 1;
margin: 10px 0 0 20px;
- background: url(images/ofbizLogo.gif);
+ background: url(/images/ofbizLogo.gif);
}
@@ -310,7 +310,7 @@ footer {
float: left;
width: 100%;
border: none;
- background: #DCDCDC url(images/bg_head_bottom_nav.jpg) no-repeat;
+ background: #DCDCDC url(/images/bg_head_bottom_nav.jpg) no-repeat;
color: #4B4B4B;
font-size: 130%;
background-size: cover;
@@ -443,7 +443,7 @@ footer {
.center .breadcrumbs ul li {
display: inline;
padding: 0 0 0 10px;
- background: transparent url(images/bg_bullet_arrow.gif) no-repeat 0 50%;
+ background: transparent url(/images/bg_bullet_arrow.gif) no-repeat 0 50%;
font-weight: bold;
color: #7D7D7D;
font-size: 100%;
@@ -520,7 +520,7 @@ footer {
w_idth: 900px;
width: 870px;
padding: 0 1em 0 1em;
- background: #FFFFFF url(images/bg_head_breadcrumbs.jpg) repeat-y;
+ background: #FFFFFF url(/images/bg_head_breadcrumbs.jpg) repeat-y;
}
/******************/
@@ -534,7 +534,7 @@ footer {
position: absolute;
z-index: 100;
margin: 0 0 0 190px;
- background: url(images/bg_corner_topright.gif) no-repeat;
+ background: url(/images/bg_corner_topright.gif) no-repeat;
}
/* MAIN CONTENT */
@@ -654,7 +654,7 @@ footer {
height: 10px;
position: absolute;
z-index: 100;
- background: url(images/bg_corner_topleft.gif) no-repeat;
+ background: url(/images/bg_corner_topleft.gif) no-repeat;
margin-top: -1px;
margin-left: -1px;
}
@@ -664,7 +664,7 @@ footer {
height: 10px;
position: absolute;
z-index: 100;
- background: url(images/bg_corner_topright.gif) no-repeat;
+ background: url(/images/bg_corner_topright.gif) no-repeat;
margin-top: -1px;
margin-left: 174px;
}
@@ -674,7 +674,7 @@ footer {
height: 10px;
position: absolute;
z-index: 100;
- background: url(images/bg_corner_topleft.gif) no-repeat;
+ background: url(/images/bg_corner_topleft.gif) no-repeat;
margin-top: 0px;
margin-left: 0px;
}
@@ -684,7 +684,7 @@ footer {
height: 10px;
position: absolute;
z-index: 100;
- background: url(images/bg_corner_topright.gif) no-repeat;
+ background: url(/images/bg_corner_topright.gif) no-repeat;
margin-top: 0px;
margin-left: 175px;
}
@@ -925,7 +925,7 @@ p:after {
.nav3-bullet dt a:visited {
line-height: 2.0em;
padding: 0 0 0 10px;
- background: url(images/bg_bullet_full_1.gif) no-repeat 0px 50%;
+ background: url(/images/bg_bullet_full_1.gif) no-repeat 0px 50%;
text-decoration: none;
color: rgb(70, 122, 167);
font-weight: bold;
@@ -937,7 +937,7 @@ p:after {
line-height: 1.7em;
margin: 0 0 0 15px;
padding: 0 0 0 10px;
- background: url(images/bg_bullet_half_1.gif) no-repeat 0px 50%;
+ background: url(/images/bg_bullet_half_1.gif) no-repeat 0px 50%;
text-decoration: none;
color: rgb(70, 122, 167);
font-weight: normal;
@@ -945,13 +945,13 @@ p:after {
}
.nav3-bullet dt a:hover {
- background: url(images/bg_bullet_full_2.gif) no-repeat 0px 50%;
+ background: url(/images/bg_bullet_full_2.gif) no-repeat 0px 50%;
text-decoration: underline;
color: rgb(42, 90, 138);
}
.nav3-bullet dd a:hover {
- background: url(images/bg_bullet_half_2.gif) no-repeat 0px 50%;
+ background: url(/images/bg_bullet_half_2.gif) no-repeat 0px 50%;
text-decoration: underline;
color: rgb(42, 90, 138);
}
@@ -1086,7 +1086,7 @@ p:after {
.left ul li {
margin: 5px 0 0.2em 2px;
padding: 0px 0px 0 11px;
- background: url(images/bg_bullet_full_1.gif) no-repeat 0 0.4em;
+ background: url(/images/bg_bullet_full_1.gif) no-repeat 0 0.4em;
line-height: 1.2em;
font-size: 110%;
}
@@ -1290,7 +1290,7 @@ p.caption {
.center ul li {
margin: 0 0 0.2em 2px;
padding: 0 0 0 12px;
- background: url(images/bg_bullet_full_1.gif) no-repeat 0 0.5em;
+ background: url(/images/bg_bullet_full_1.gif) no-repeat 0 0.5em;
line-height: 1.4em;
font-size: 120%;
}
@@ -1473,7 +1473,7 @@ p.caption {
.right ul li {
margin: 5px 0 0.2em 2px;
padding: 0 0 0 11px;
- background: url(images/bg_bullet_full_1.gif) no-repeat 0 0.4em;
+ background: url(/images/bg_bullet_full_1.gif) no-repeat 0 0.4em;
line-height: 1.2em;
font-size: 110%;
}
@@ -1632,7 +1632,7 @@ img {
#ecom-mainarea .rightonly {
width: 670px;
padding: 0 1em 0 1.5em;
- background: #FFFFFF url(images/bg_head_breadcrumbs.jpg) repeat-y;
+ background: #FFFFFF url(/images/bg_head_breadcrumbs.jpg) repeat-y;
}
#ecom-mainarea .leftonly {
@@ -2181,19 +2181,19 @@ a.offlnk:hover {
}
.bl {
- background: url(images/bg_corner_topleft.gif) #AAAAAA 0 100% no-repeat;
+ background: url(/images/bg_corner_topleft.gif) #AAAAAA 0 100% no-repeat;
}
.br {
- background: url(images/bg_corner_topleft.gif) 100% 100% no-repeat;
+ background: url(/images/bg_corner_topleft.gif) 100% 100% no-repeat;
}
.tl {
- background: url(images/bg_corner_topleft.gif) 0 0 no-repeat;
+ background: url(/images/bg_corner_topleft.gif) 0 0 no-repeat;
}
.tr {
- background: url(images/bg_corner_topright.gif) 100% 0 no-repeat;
+ background: url(/images/bg_corner_topright.gif) 100% 0 no-repeat;
padding: 10px;
}
@@ -2361,7 +2361,7 @@ img.cssImgSmall {
.ui-widget-content {
border: 1px solid #aaaaaa;
- background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50%
repeat-x;
+ background: #ffffff url(/images/ui-bg_flat_75_ffffff_40x100.png) 50% 50%
repeat-x;
color: #222222;
}
@@ -2371,7 +2371,7 @@ img.cssImgSmall {
.ui-widget-header {
border: 1px solid #aaaaaa;
- background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)
50% 50% repeat-x;
+ background: #cccccc url(/images/ui-bg_highlight-soft_75_cccccc_1x100.png)
50% 50% repeat-x;
color: #222222;
font-weight: bold;
}
@@ -2384,7 +2384,7 @@ img.cssImgSmall {
----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header
.ui-state-default {
border: 1px solid #d3d3d3;
- background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50%
repeat-x;
+ background: #e6e6e6 url(/images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50%
repeat-x;
font-weight: normal;
color: #555555;
}
@@ -2396,7 +2396,7 @@ img.cssImgSmall {
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header
.ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
border: 1px solid #999999;
- background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50%
repeat-x;
+ background: #dadada url(/images/ui-bg_glass_75_dadada_1x400.png) 50% 50%
repeat-x;
font-weight: normal;
color: #212121;
}
@@ -2408,7 +2408,7 @@ img.cssImgSmall {
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header
.ui-state-active {
border: 1px solid #aaaaaa;
- background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50%
repeat-x;
+ background: #ffffff url(/images/ui-bg_glass_65_ffffff_1x400.png) 50% 50%
repeat-x;
font-weight: normal;
color: #212121;
}
@@ -2426,7 +2426,7 @@ img.cssImgSmall {
----------------------------------*/
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header
.ui-state-highlight {
border: 1px solid #fcefa1;
- background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50%
repeat-x;
+ background: #fbf9ee url(/images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50%
repeat-x;
color: #363636;
}
@@ -2436,7 +2436,7 @@ img.cssImgSmall {
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header
.ui-state-error {
border: 1px solid #cd0a0a;
- background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50%
repeat-x;
+ background: #fef1ec url(/images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50%
repeat-x;
color: #cd0a0a;
}
@@ -2471,35 +2471,35 @@ img.cssImgSmall {
.ui-icon {
width: 16px;
height: 16px;
- background-image: url(images/ui-icons_222222_256x240.png);
+ background-image: url(/images/ui-icons_222222_256x240.png);
}
.ui-widget-content .ui-icon {
- background-image: url(images/ui-icons_222222_256x240.png);
+ background-image: url(/images/ui-icons_222222_256x240.png);
}
.ui-widget-header .ui-icon {
- background-image: url(images/ui-icons_222222_256x240.png);
+ background-image: url(/images/ui-icons_222222_256x240.png);
}
.ui-state-default .ui-icon {
- background-image: url(images/ui-icons_888888_256x240.png);
+ background-image: url(/images/ui-icons_888888_256x240.png);
}
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
- background-image: url(images/ui-icons_454545_256x240.png);
+ background-image: url(/images/ui-icons_454545_256x240.png);
}
.ui-state-active .ui-icon {
- background-image: url(images/ui-icons_454545_256x240.png);
+ background-image: url(/images/ui-icons_454545_256x240.png);
}
.ui-state-highlight .ui-icon {
- background-image: url(images/ui-icons_2e83ff_256x240.png);
+ background-image: url(/images/ui-icons_2e83ff_256x240.png);
}
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {
- background-image: url(images/ui-icons_cd0a0a_256x240.png);
+ background-image: url(/images/ui-icons_cd0a0a_256x240.png);
}
/* positioning */
@@ -3272,7 +3272,7 @@ img.cssImgSmall {
/* Overlays */
.ui-widget-overlay {
- background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50%
repeat-x;
+ background: #aaaaaa url(/images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50%
repeat-x;
opacity: .30;
filter: Alpha(Opacity=30);
}
@@ -3280,7 +3280,7 @@ img.cssImgSmall {
.ui-widget-shadow {
margin: -8px 0 0 -8px;
padding: 8px;
- background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50%
repeat-x;
+ background: #aaaaaa url(/images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50%
repeat-x;
opacity: .30;
filter: Alpha(Opacity=30);
-moz-border-radius: 8px;
Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GanttChart.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GanttChart.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GanttChart.groovy
(original)
+++ ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GanttChart.groovy Sun
May 26 10:36:16 2019
@@ -119,7 +119,7 @@ if (phases) {
latestTaskIds.add(wf.workEffortId)
}
count = 0
- if (UtilValidate.isNotEmpty(latestTaskIds)) {
+ if (latestTaskIds) {
taskInfo.preDecessor = ""
for (i in latestTaskIds) {
if (count > 0) {
Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GetProjectId.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GetProjectId.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GetProjectId.groovy
(original)
+++ ofbiz/ofbiz-plugins/trunk/projectmgr/groovyScripts/GetProjectId.groovy Sun
May 26 10:36:16 2019
@@ -22,7 +22,7 @@ import org.apache.ofbiz.base.util.UtilVa
if (parameters.workEffortId) {
workEffortId = parameters.workEffortId
projects = from("ProjectAndPhaseAndTask").where("workEffortId",
workEffortId).queryList()
- if (UtilValidate.isNotEmpty(projects)) {
+ if (projects) {
context.put("projectId", projects.get(0).getString("projectId"))
context.put("projectName", projects.get(0).getString("projectName"))
context.put("phaseName", projects.get(0).getString("phaseName"))
Modified:
ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/FindProductBacklogItem.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/FindProductBacklogItem.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/FindProductBacklogItem.groovy
(original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/FindProductBacklogItem.groovy
Sun May 26 10:36:16 2019
@@ -88,7 +88,7 @@ if ("Y".equals(parameters.noConditionFin
conditionsBacklog = EntityCondition.makeCondition(conditionBacklogList,
EntityOperator.AND)
- if(UtilValidate.isNotEmpty(orConditionsBacklog)){
+ if(orConditionsBacklog){
mainConditionBacklogList.add(orConditionsBacklog)
}
Modified:
ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ListCurrentProducts.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ListCurrentProducts.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ListCurrentProducts.groovy
(original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ListCurrentProducts.groovy
Sun May 26 10:36:16 2019
@@ -40,16 +40,16 @@ if(!security.hasEntityPermission("SCRUM"
}
if (userLogin) {
- if(UtilValidate.isNotEmpty(partyId)){
+ if(partyId){
paramCond.add(EntityCondition.makeCondition("partyId",
EntityOperator.EQUALS, partyId))
}
- if(UtilValidate.isNotEmpty(productId)){
+ if(productId){
paramCond.add(EntityCondition.makeCondition("productId",
EntityOperator.LIKE, productId + "%"))
}
- if(UtilValidate.isNotEmpty(internalName)){
+ if(internalName){
paramCond.add(EntityCondition.makeCondition("internalName",
EntityOperator.LIKE, "%" + internalName + "%"))
}
- if(UtilValidate.isNotEmpty(statusId)){
+ if(statusId){
if ("PRODUCT_ACTIVE".equals(statusId)) {
paramCond.add(EntityCondition.makeCondition("supportDiscontinuationDate",
EntityOperator.EQUALS, null))
} else {
Modified: ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ProductEmail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ProductEmail.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ProductEmail.groovy (original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/ProductEmail.groovy Sun May
26 10:36:16 2019
@@ -27,8 +27,8 @@ loginPartyId = userLogin.partyId
communicationEventId = parameters.communicationEventId
now = UtilDateTime.nowTimestamp()
try{
- if (UtilValidate.isNotEmpty(loginPartyId)) {
- if (UtilValidate.isNotEmpty(productId)) {
+ if (loginPartyId) {
+ if (productId) {
context.product = from("Product").where("productId",
productId).queryOne()
}
communicationEvent =
from("CommunicationEvent").where("communicationEventId",
communicationEventId).queryOne()
Modified: ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/cart/ShowCart.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/cart/ShowCart.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/cart/ShowCart.groovy
(original)
+++ ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/cart/ShowCart.groovy Sun May
26 10:36:16 2019
@@ -32,9 +32,9 @@ if (webPosSession) {
context.isOpen = webPosSession.getCurrentTransaction().isOpen();
context.person = null;
- if (UtilValidate.isNotEmpty(shoppingCart)) {
+ if (shoppingCart) {
placingCustomerParty = from("PartyAndPerson").where("partyId",
shoppingCart.getPlacingCustomerPartyId()).queryOne();
- if (UtilValidate.isNotEmpty(placingCustomerParty)) {
+ if (placingCustomerParty) {
context.person = placingCustomerParty.lastName + " " +
placingCustomerParty.firstName;
}
}
Modified:
ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/search/CustomerAddress.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/search/CustomerAddress.groovy?rev=1860051&r1=1860050&r2=1860051&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/search/CustomerAddress.groovy
(original)
+++
ofbiz/ofbiz-plugins/trunk/webpos/groovyScripts/search/CustomerAddress.groovy
Sun May 26 10:36:16 2019
@@ -23,24 +23,24 @@ webPosSession = WebPosEvents.getWebPosSe
if (webPosSession) {
shoppingCart = webPosSession.getCart()
shipToCustomerPartyId = shoppingCart.getShipToCustomerPartyId()
- if (UtilValidate.isNotEmpty(shipToCustomerPartyId)) {
+ if (shipToCustomerPartyId) {
context.personShipTo = from("Person").where("partyId",
shipToCustomerPartyId).queryOne()
}
shippingContactMechId = shoppingCart.getContactMech("SHIPPING_LOCATION")
- if (UtilValidate.isNotEmpty(shippingContactMechId)) {
+ if (shippingContactMechId) {
contactMech = from("ContactMech").where("contactMechId",
shippingContactMechId).queryOne()
- if (UtilValidate.isNotEmpty(contactMech) &&
"POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
+ if (contactMech &&
"POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
context.shippingPostalAddress =
contactMech.getRelatedOne("PostalAddress", false)
}
}
billToCustomerPartyId = shoppingCart.getBillToCustomerPartyId()
- if (UtilValidate.isNotEmpty(billToCustomerPartyId)) {
+ if (billToCustomerPartyId) {
context.personBillTo = from("Person").where("partyId",
billToCustomerPartyId).queryOne()
}
billingContactMechId = shoppingCart.getContactMech("BILLING_LOCATION")
- if (UtilValidate.isNotEmpty(billingContactMechId)) {
+ if (billingContactMechId) {
contactMech = from("ContactMech").where("contactMechId",
billingContactMechId).queryOne()
- if (UtilValidate.isNotEmpty(contactMech) &&
"POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
+ if (contactMech &&
"POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
context.billingPostalAddress =
contactMech.getRelatedOne("PostalAddress", false)
}
}
