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-11-30 00:48:51 +00:00
parent b01c48fa49
commit 9897924879
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,19 +261,24 @@ namespace AyaNova.Biz
var filterItem = v[i];
if (filterItem["fld"] == null)
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"fld\" property ");
else{
//todo: find the filteroptions object adn confirm this is a valid value for fld
}
else
{
var fld = filterItem["fld"].Value<string>();
if (string.IsNullOrWhiteSpace(fld))
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, \"fld\" property is empty and required");
}
if (filterItem["op"] == null)
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"op\" property ");
else
{
var opType = filterItem["op"].Value<string>();
if (!FilterComparisonOperator.Operators.Contains(opType))
AddError(ValidationErrorType.InvalidValue, "Filter", $"Filter array item {i}, \"op\" value of \"{opType}\" is not a valid FilterComparisonOperator type");
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 ");
//NOTE: value of nothing, null or empty is a valid value so no checking for it here
}
}
catch (Newtonsoft.Json.JsonReaderException ex)

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

@@ -16,11 +16,6 @@ namespace AyaNova.Biz
//FILTEROPTIONS COLLECTION
FilterOptions FilterOptions { get; }
List<FilterField> FilterFields {get;}
//VALIDATE FILTER?
}

6
server/AyaNova/biz/WidgetBiz.cs
View File

@@ -33,11 +33,7 @@ namespace AyaNova.Biz
}
}
public static List<FilterField> FilterFields(){
List<FilterField> fields=new List<FilterField>();
fields.Add(new FilterField())
}
internal WidgetBiz(AyContext dbcontext, long currentUserId, long userLocaleId, AuthorizationRoles UserRoles)
{
ct = dbcontext;