From 596a9adeb981d4007781d9bd84e6c8a261fa459f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 14 Jan 2020 22:58:49 +0000 Subject: [PATCH] --- server/AyaNova/biz/FilterSqlCriteriaBuilder.cs | 2 +- server/AyaNova/biz/RequiredFieldsValidator.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs index 221c950a..e3718e9d 100644 --- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs +++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs @@ -38,7 +38,7 @@ namespace AyaNova.Biz tagList = filterItem["value"].ToObject>(); } - var dataType = objectFields.Find(x => x.Key == fld).DataType; + var dataType = objectFields.Find(x => x.PropertyName.ToLowerInvariant() == fld).DataType; sb.Append("("); sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId)); if (i < FilterArray.Count - 1) diff --git a/server/AyaNova/biz/RequiredFieldsValidator.cs b/server/AyaNova/biz/RequiredFieldsValidator.cs index 82b994a3..78b65486 100644 --- a/server/AyaNova/biz/RequiredFieldsValidator.cs +++ b/server/AyaNova/biz/RequiredFieldsValidator.cs @@ -31,7 +31,10 @@ namespace AyaNova.Biz //get the FormField object 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 string RequiredPropertyName = FF.PropertyName;