admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-12-03 20:17:59 +00:00
parent 59beefd3a4
commit ee5cfd16ff
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/biz/DataFilterBiz.cs
View File

@@ -292,8 +292,8 @@ namespace AyaNova.Biz
if (!FilterComparisonOperator.Operators.Contains(opType))
AddError(ValidationErrorType.InvalidValue, "Filter", $"Filter array item {i}, \"op\" property value of \"{opType}\" is not a valid FilterComparisonOperator type");
}
if (filterItem["value"] == null)
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"value\" property ");
if (filterItem["value"] == null || string.IsNullOrWhiteSpace(filterItem["value"].Value<string>()))
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing or is empty the required \"value\" property ");
//NOTE: value of nothing, null or empty is a valid value so no checking for it here
}
}

11
server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
View File

@@ -51,16 +51,7 @@ namespace AyaNova.Biz
sb.Append(sColumn);
sb.Append(" ");
//Added: 13-July-2006 prior fix on the 6th either broke due to other changes or
//was not enough in the first place, oddly it was working then, but this is also needed
//now to make it work:
//Handle bools with null values
//this comes about from a user selecting blanks or nonblanks to filter a bool column
if (sValue == "" && sDataType == "System.Boolean")
{
sValue = "False";
}
//handle null values separately
if (sValue == "")