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
2019-01-17 16:28:53 +00:00
parent 3c3c52bee4
commit ea0ffc9372
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ namespace AyaNova.Biz
internal static class PickListFetcher internal static class PickListFetcher
{ {
internal static PickListResult GetPickList(AyContext ct, long userId, PagingOptions pagingOptions, string tableName) internal static PickListResult GetPickList(AyContext ct, long userId, PagingOptions pagingOptions, FilterOptions filterOptions, string tableName)
{ {
List<NameIdItem> listItems = new List<NameIdItem>(); List<NameIdItem> listItems = new List<NameIdItem>();
@@ -39,7 +39,8 @@ namespace AyaNova.Biz
var TheFilter = ct.DataFilter.FirstOrDefault(x => x.Id == pagingOptions.DataFilterId); var TheFilter = ct.DataFilter.FirstOrDefault(x => x.Id == pagingOptions.DataFilterId);
//BUILD WHERE AND APPEND IT //BUILD WHERE AND APPEND IT
qCriteria = FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), userId); //qCriteria = FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), userId);
qCriteria = FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, filterOptions, userId);
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
qSort = FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); qSort = FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);

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

@@ -240,7 +240,7 @@ namespace AyaNova.Biz
pagingOptions.Limit = pagingOptions.Limit ?? PagingOptions.DefaultLimit; pagingOptions.Limit = pagingOptions.Limit ?? PagingOptions.DefaultLimit;
var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, "auser"); var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, FilterOptions(), "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

@@ -324,7 +324,7 @@ namespace AyaNova.Biz
{ {
pagingOptions.Offset = pagingOptions.Offset ?? PagingOptions.DefaultOffset; pagingOptions.Offset = pagingOptions.Offset ?? PagingOptions.DefaultOffset;
pagingOptions.Limit = pagingOptions.Limit ?? PagingOptions.DefaultLimit; pagingOptions.Limit = pagingOptions.Limit ?? PagingOptions.DefaultLimit;
var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, "awidget"); var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, FilterOptions(), "awidget");
var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject(); var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject();
ApiPagedResponse<NameIdItem> pr = new ApiPagedResponse<NameIdItem>(ret.Items, pageLinks); ApiPagedResponse<NameIdItem> pr = new ApiPagedResponse<NameIdItem>(ret.Items, pageLinks);
return pr; return pr;