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
2020-03-23 20:00:16 +00:00
parent cb08a727fa
commit 7e361d3f41
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/AyaNova/Controllers/PickListController.cs
View File

@@ -58,7 +58,7 @@ namespace AyaNova.Api.Controllers
/// <param name="preId">Return only one item (for pre-selected items on forms) </param> /// <param name="preId">Return only one item (for pre-selected items on forms) </param>
/// <returns>Filtered list</returns> /// <returns>Filtered list</returns>
[HttpGet("List")] [HttpGet("List")]
public async Task<IActionResult> GetList([FromQuery]AyaType ayaType, [FromQuery]string query, [FromQuery] bool inactive, [FromQuery]long preId) public async Task<IActionResult> GetList([FromQuery]AyaType ayaType, [FromQuery]string query, [FromQuery] bool inactive, [FromQuery]long? preId)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
@@ -81,7 +81,9 @@ namespace AyaNova.Api.Controllers
//Instantiate the business object handler //Instantiate the business object handler
PickListBiz biz = PickListBiz.GetBiz(ct, HttpContext); 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) if (o == null)
return BadRequest(new ApiErrorResponse(biz.Errors)); return BadRequest(new ApiErrorResponse(biz.Errors));
else else

2
server/AyaNova/PickList/PickListFetcher.cs
View File

@@ -34,7 +34,7 @@ namespace AyaNova.PickList
List<string> TemplateColumnNames = PickList.GetFieldListFromTemplate(jTemplate); List<string> TemplateColumnNames = PickList.GetFieldListFromTemplate(jTemplate);
//BUILD THE QUERY //BUILD THE QUERY
var q = PickListSqlBuilder.Build(PickList, TemplateColumnNames, autoCompleteQuery, tagSpecificQuery, includeInactive); var q = PickListSqlBuilder.Build(PickList, TemplateColumnNames, autoCompleteQuery, tagSpecificQuery, includeInactive, preId);
//RETURN OBJECTS //RETURN OBJECTS
var ret = new List<NameIdActiveItem>(); var ret = new List<NameIdActiveItem>();

2
server/AyaNova/PickList/PickListSqlBuilder.cs
View File

@@ -24,7 +24,7 @@ namespace AyaNova.PickList
const int MAXIMUM_RESULT_COUNT = 100; const int MAXIMUM_RESULT_COUNT = 100;
//Build the query for a picklist request //Build the query for a picklist request
internal static string Build(IAyaPickList pickList, List<string> templateColumnNames, string autoCompleteQuery, string tagSpecificQuery, bool IncludeInactive) internal static string Build(IAyaPickList pickList, List<string> templateColumnNames, string autoCompleteQuery, string tagSpecificQuery, bool IncludeInactive, long preId)
{ {
//determine this in advance as it will be used in a loop later //determine this in advance as it will be used in a loop later