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 21:57:00 +00:00
parent e362a6734e
commit 16edc83450
4 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/AyaNova/biz/ObjectFields.cs
View File

@@ -135,7 +135,6 @@ namespace AyaNova.Biz
{ {
public string Key { get; set; } public string Key { get; set; }
public string PropertyName { get; set; } public string PropertyName { get; set; }
//NOTE: Not hideable fields don't require a PropertyName value because they are already required and will be validated
public bool Hideable { get; set; } public bool Hideable { get; set; }
public bool SharedLTKey { get; set; } public bool SharedLTKey { get; set; }
public bool Custom { get; set; } public bool Custom { get; set; }
@@ -158,24 +157,6 @@ namespace AyaNova.Biz
MiniAvailable = true; MiniAvailable = true;
} }
// public ObjectField(string key, string propertyName, bool sharedLTKey = false, bool hideable = true, bool custom = false)
// {
// Key = key;
// Hideable = hideable;
// Custom = custom;
// SharedLTKey = sharedLTKey;
// PropertyName = propertyName;//Only if hideable do they require this as non-hideable ones are automatically validated anyway and this is only required for validation
// }
// public ObjectField(string key, bool sharedLTKey = false, bool hideable = true, bool custom = false)
// {
// Key = key;
// Hideable = hideable;
// Custom = custom;
// SharedLTKey = sharedLTKey;
// PropertyName = null;
// }
} }

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

@@ -191,7 +191,7 @@ namespace AyaNova.Biz
var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId); var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId);
//BUILD WHERE AND APPEND IT //BUILD WHERE AND APPEND IT
q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList("user"), UserId); q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList(ObjectFields.USER_KEY), UserId);
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
q = q + FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); q = q + FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
@@ -252,7 +252,7 @@ namespace AyaNova.Biz
pagingOptions.Limit = pagingOptions.Limit ?? ListOptions.DefaultLimit; pagingOptions.Limit = pagingOptions.Limit ?? ListOptions.DefaultLimit;
var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, ObjectFields.ObjectFieldsList("user"), "auser"); var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, ObjectFields.ObjectFieldsList(ObjectFields.USER_KEY), "auser");
var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject(); var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject();

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

@@ -305,7 +305,7 @@ namespace AyaNova.Biz
var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId); var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId);
//BUILD WHERE AND APPEND IT //BUILD WHERE AND APPEND IT
q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList("widget"), UserId); q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList(ObjectFields.WIDGET_KEY), UserId);
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
q = q + FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); q = q + FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);

2
server/AyaNova/util/Seeder.cs
View File

@@ -81,7 +81,7 @@ namespace AyaNova.Util
{ {
var fc = new FormCustom() var fc = new FormCustom()
{ {
FormKey = "widget", FormKey = ObjectFields.WIDGET_KEY,
Template = @"[ Template = @"[
{ {
""fld"": ""WidgetNotes"", ""fld"": ""WidgetNotes"",