From 7bb23fedd30b8334b568d2834314cd342ec701b6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 21 Jan 2020 23:09:57 +0000 Subject: [PATCH] --- server/AyaNova/ControllerHelpers/ListOptions.cs | 3 +++ server/AyaNova/Controllers/DataListController.cs | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/ControllerHelpers/ListOptions.cs b/server/AyaNova/ControllerHelpers/ListOptions.cs index c63078e4..8665adc2 100644 --- a/server/AyaNova/ControllerHelpers/ListOptions.cs +++ b/server/AyaNova/ControllerHelpers/ListOptions.cs @@ -26,6 +26,9 @@ namespace AyaNova.Api.ControllerHelpers [FromQuery] public bool Mini { get; set; } + [FromQuery, Required] + public string DataListKey { get; set; } + } diff --git a/server/AyaNova/Controllers/DataListController.cs b/server/AyaNova/Controllers/DataListController.cs index 6a4f3963..7c4f634f 100644 --- a/server/AyaNova/Controllers/DataListController.cs +++ b/server/AyaNova/Controllers/DataListController.cs @@ -9,6 +9,7 @@ using AyaNova.Api.ControllerHelpers; using AyaNova.Biz; using AyaNova.DataList; using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; namespace AyaNova.Api.Controllers { @@ -63,15 +64,14 @@ namespace AyaNova.Api.Controllers } "; - long UserId = UserIdFromContext.Id(HttpContext.Items); - ApiPagedResponse pr = await DataListFetcher.GetResponse(nameof(WidgetDataList), ct, Url, nameof(List), listOptions, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON, UserId); + long UserId = UserIdFromContext.Id(HttpContext.Items); + ApiPagedResponse pr = await DataListFetcher.GetResponse(listOptions.DataListKey, ct, Url, nameof(List), listOptions, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON, UserId); - - // ApiPagedResponse pr = biz.GetList(Url, nameof(List), listOptions).Result; return Ok(new ApiOkWithPagingResponse(pr)); - } + + /// /// List of all DataList keys available ///