From 7e361d3f418b360854e61b79beda1955bc93ca50 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 23 Mar 2020 20:00:16 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/PickListController.cs | 6 ++++-- server/AyaNova/PickList/PickListFetcher.cs | 2 +- server/AyaNova/PickList/PickListSqlBuilder.cs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/Controllers/PickListController.cs b/server/AyaNova/Controllers/PickListController.cs index 6f7bcdb8..7e9ccdcf 100644 --- a/server/AyaNova/Controllers/PickListController.cs +++ b/server/AyaNova/Controllers/PickListController.cs @@ -58,7 +58,7 @@ namespace AyaNova.Api.Controllers /// Return only one item (for pre-selected items on forms) /// Filtered list [HttpGet("List")] - public async Task GetList([FromQuery]AyaType ayaType, [FromQuery]string query, [FromQuery] bool inactive, [FromQuery]long preId) + public async Task GetList([FromQuery]AyaType ayaType, [FromQuery]string query, [FromQuery] bool inactive, [FromQuery]long? preId) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); @@ -81,7 +81,9 @@ namespace AyaNova.Api.Controllers //Instantiate the business object handler PickListBiz biz = PickListBiz.GetBiz(ct, HttpContext); - var o = await biz.GetPickListAsync(PickList, query, inactive, preId, log); + if (preId == null) + preId = 0; + var o = await biz.GetPickListAsync(PickList, query, inactive, (long)preId, log); if (o == null) return BadRequest(new ApiErrorResponse(biz.Errors)); else diff --git a/server/AyaNova/PickList/PickListFetcher.cs b/server/AyaNova/PickList/PickListFetcher.cs index e7dd1979..f0aa9248 100644 --- a/server/AyaNova/PickList/PickListFetcher.cs +++ b/server/AyaNova/PickList/PickListFetcher.cs @@ -34,7 +34,7 @@ namespace AyaNova.PickList List TemplateColumnNames = PickList.GetFieldListFromTemplate(jTemplate); //BUILD THE QUERY - var q = PickListSqlBuilder.Build(PickList, TemplateColumnNames, autoCompleteQuery, tagSpecificQuery, includeInactive); + var q = PickListSqlBuilder.Build(PickList, TemplateColumnNames, autoCompleteQuery, tagSpecificQuery, includeInactive, preId); //RETURN OBJECTS var ret = new List(); diff --git a/server/AyaNova/PickList/PickListSqlBuilder.cs b/server/AyaNova/PickList/PickListSqlBuilder.cs index c102b87f..013e7b9f 100644 --- a/server/AyaNova/PickList/PickListSqlBuilder.cs +++ b/server/AyaNova/PickList/PickListSqlBuilder.cs @@ -24,7 +24,7 @@ namespace AyaNova.PickList const int MAXIMUM_RESULT_COUNT = 100; //Build the query for a picklist request - internal static string Build(IAyaPickList pickList, List templateColumnNames, string autoCompleteQuery, string tagSpecificQuery, bool IncludeInactive) + internal static string Build(IAyaPickList pickList, List templateColumnNames, string autoCompleteQuery, string tagSpecificQuery, bool IncludeInactive, long preId) { //determine this in advance as it will be used in a loop later