This commit is contained in:
@@ -42,24 +42,24 @@ namespace AyaNova.Models
|
||||
//SERVER FILTER PROCESSING HERE CODE SEE DATALISTFETCHER
|
||||
|
||||
|
||||
|
||||
List<DataListFilterOption> StaticServerFilterOptions = new List<DataListFilterOption>();
|
||||
if (dataList is IDataListInternalCriteria)
|
||||
StaticServerFilterOptions = ((IDataListInternalCriteria)dataList).DataListInternalCriteria(userId, userRoles, request.ClientCriteria);
|
||||
/*
|
||||
List<DataListFilterOption> StaticServerFilterOptions = new List<DataListFilterOption>();
|
||||
if (DataList is IDataListInternalCriteria)
|
||||
StaticServerFilterOptions = ((IDataListInternalCriteria)DataList).DataListInternalCriteria(userId, userRoles, dataListTableOptions);
|
||||
|
||||
// //Get the public field key names in a list from the listview
|
||||
// List<string> PublicListViewFieldList = listOptions.Columns;
|
||||
|
||||
// //Get the public field key names in a list from the listview
|
||||
// List<string> PublicListViewFieldList = listOptions.Columns;
|
||||
//Get the combination of all unique fields from both StaticServerFilterOptions and listOptions
|
||||
//NOTE: this assumes no list options filter colums that don't exist in listoptions.columns
|
||||
var AllUniqueFieldKeysRequiredForQuery = dataListTableOptions.Columns.Union(StaticServerFilterOptions.Select(z => z.Column).ToList()).ToList();
|
||||
|
||||
//Get the combination of all unique fields from both StaticServerFilterOptions and listOptions
|
||||
//NOTE: this assumes no list options filter colums that don't exist in listoptions.columns
|
||||
var AllUniqueFieldKeysRequiredForQuery = dataListTableOptions.Columns.Union(StaticServerFilterOptions.Select(z => z.Column).ToList()).ToList();
|
||||
|
||||
//Add the internal filters into the listoptions existing filters
|
||||
//NOTE: There is currently no overlap between internal filtered columns and filters coming from the client
|
||||
foreach (DataListFilterOption dfo in StaticServerFilterOptions)
|
||||
dataListTableOptions.Filter.Add(dfo);
|
||||
*/
|
||||
//Add the internal filters into the listoptions existing filters
|
||||
//NOTE: There is currently no overlap between internal filtered columns and filters coming from the client
|
||||
foreach (DataListFilterOption dfo in StaticServerFilterOptions)
|
||||
dataListTableOptions.Filter.Add(dfo);
|
||||
*/
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user