Author: jleroux Date: Tue Jun 28 21:11:06 2016 New Revision: 1750585 URL: http://svn.apache.org/viewvc?rev=1750585&view=rev Log: No functional change, just removing trailing blanks
Modified: ofbiz/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy Modified: ofbiz/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy?rev=1750585&r1=1750584&r2=1750585&view=diff ============================================================================== --- ofbiz/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy (original) +++ ofbiz/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy Tue Jun 28 21:11:06 2016 @@ -67,7 +67,7 @@ if (searchFields && fieldValue) { } searchFieldsList.each { fieldName -> if ("EQUALS".equals(searchType)) { - orExprs.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(searchFieldsList[0]), EntityOperator.EQUALS, searchValue)); + orExprs.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(searchFieldsList[0]), EntityOperator.EQUALS, searchValue)); return;//in case of EQUALS, we search only a match for the returned field } else { orExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue(fieldName)), EntityOperator.LIKE, searchValue)); @@ -86,9 +86,9 @@ if (conditionFields) { if (conditionFieldEntry.getValue() instanceof java.util.List) { def orCondFields = []; for (entry in conditionFieldEntry.getValue()) { - orCondFields.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(conditionFieldEntry.getKey()), EntityOperator.EQUALS, entry)); + orCondFields.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(conditionFieldEntry.getKey()), EntityOperator.EQUALS, entry)); } - mainAndConds.add(EntityCondition.makeCondition(orCondFields, EntityOperator.OR)); + mainAndConds.add(EntityCondition.makeCondition(orCondFields, EntityOperator.OR)); } else { mainAndConds.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(conditionFieldEntry.getKey()), EntityOperator.EQUALS, conditionFieldEntry.getValue())); }