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
2021-01-29 21:51:34 +00:00
parent 740323c67d
commit 3bc7aba2c2
14 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/AyaNova/DataList/DataListFetcher.cs
View File

@@ -74,8 +74,8 @@ namespace AyaNova.DataList
qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, dataListTableOptions);
//LIMIT AND OFFSET CLAUSE - PAGING
dataListTableOptions.Offset = dataListTableOptions.Offset ?? DataListTableOptions.DefaultOffset;
dataListTableOptions.Limit = dataListTableOptions.Limit ?? DataListTableOptions.DefaultLimit;
dataListTableOptions.Offset = dataListTableOptions.Offset ?? DataListTableProcessingOptions.DefaultOffset;
dataListTableOptions.Limit = dataListTableOptions.Limit ?? DataListTableProcessingOptions.DefaultLimit;
var qLimitOffset = $"LIMIT {dataListTableOptions.Limit} OFFSET {dataListTableOptions.Offset}";
//PUT IT ALL TOGETHER
@@ -244,7 +244,7 @@ namespace AyaNova.DataList
//
//
//internal static async Task<long[]> GetIdListResponseAsync(string dataListKey, string listView, string metaListView, AyContext ct, AuthorizationRoles userRoles, ILogger log, long userId)
internal static async Task<long[]> GetIdListResponseAsync(AyContext ct, DataListSelectionOptions dataListSelectionOptions, AuthorizationRoles userRoles, ILogger log, long userId)
internal static async Task<long[]> GetIdListResponseAsync(AyContext ct, DataListSelectedProcessingOptions dataListSelectionOptions, AuthorizationRoles userRoles, ILogger log, long userId)
{
var DataList = DataListFactory.GetAyaDataList(dataListSelectionOptions.DataListKey);
//was the name not found as a list?

4
server/AyaNova/DataList/DataListProcessingBase.cs
View File

@@ -50,9 +50,9 @@ namespace AyaNova.DataList
listOptions.SortBy = new Dictionary<string, string>();
//Check Columns
if (listOptions is DataListTableOptions)
if (listOptions is DataListTableProcessingOptions)
{
var dlto = ((DataListTableOptions)listOptions);
var dlto = ((DataListTableProcessingOptions)listOptions);
if (dlto.Columns == null)
dlto.Columns = new List<string>();
//if this doesn't work then just ditch this method in favor of local code, it's not really saving much

2
server/AyaNova/DataList/DataListSqlSelectBuilder.cs
View File

@@ -114,7 +114,7 @@ namespace AyaNova.DataList
//Build the SELECT portion of a list query but only to return rowid's
internal static string BuildForIdListResponse(List<DataListFieldDefinition> fieldDefinitions, DataListSelectionOptions dataListSelectionOptions)
internal static string BuildForIdListResponse(List<DataListFieldDefinition> fieldDefinitions, DataListSelectedProcessingOptions dataListSelectionOptions)
{
//BugBug - is not including internalcriteria OR user filtered columns so they don't filter properly
//needs to be there and also return correct 0th column for id filtering or make sure it's always the zeroth I guess