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
2020-01-14 22:58:49 +00:00
parent 16edc83450
commit 596a9adeb9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ namespace AyaNova.Biz
tagList = filterItem["value"].ToObject<List<String>>(); tagList = filterItem["value"].ToObject<List<String>>();
} }
var dataType = objectFields.Find(x => x.Key == fld).DataType; var dataType = objectFields.Find(x => x.PropertyName.ToLowerInvariant() == fld).DataType;
sb.Append("("); sb.Append("(");
sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId)); sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId));
if (i < FilterArray.Count - 1) if (i < FilterArray.Count - 1)

5
server/AyaNova/biz/RequiredFieldsValidator.cs
View File

@@ -31,7 +31,10 @@ namespace AyaNova.Biz
//get the FormField object //get the FormField object
ObjectField FF = FormFields.Where(x => x.Key == FldLtKey).Single(); ObjectField FF = FormFields.Where(x => x.Key == FldLtKey).Single();
if (!string.IsNullOrWhiteSpace(FF.PropertyName))
//don't validate custom fields, just skip them
// if (!string.IsNullOrWhiteSpace(FF.PropertyName))//this used to work because there would be no property name but now there is so it doesn't
if (!FF.Custom)
{ {
//Now get the actual property name from the available fields using the lt key //Now get the actual property name from the available fields using the lt key
string RequiredPropertyName = FF.PropertyName; string RequiredPropertyName = FF.PropertyName;