diff --git a/server/AyaNova/Controllers/PartAssemblyController.cs b/server/AyaNova/Controllers/PartAssemblyController.cs index 0274c762..f9e280c1 100644 --- a/server/AyaNova/Controllers/PartAssemblyController.cs +++ b/server/AyaNova/Controllers/PartAssemblyController.cs @@ -107,7 +107,7 @@ namespace AyaNova.Api.Controllers return StatusCode(403, new ApiNotAuthorizedResponse()); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - var o = await biz.GetAsync(id); + var o = await biz.GetAsync(id,true,true); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); return Ok(ApiOkResponse.Response(o)); } diff --git a/server/AyaNova/PickList/PickListFetcher.cs b/server/AyaNova/PickList/PickListFetcher.cs index fb237e90..9a050604 100644 --- a/server/AyaNova/PickList/PickListFetcher.cs +++ b/server/AyaNova/PickList/PickListFetcher.cs @@ -13,9 +13,6 @@ namespace AyaNova.PickList internal static async Task> GetResponseAsync(IAyaPickList PickList, string autoCompleteQuery, string tagSpecificQuery, bool includeInactive, long[] preIds, string variant, AyContext ct, ILogger log) { - //This may be called internally in *Biz classes who don't have a log of their own - if (log == null) - log = AyaNova.Util.ApplicationLogging.CreateLogger("PickListFetcher"); //Sort out effective Template string Template = null; @@ -72,6 +69,9 @@ namespace AyaNova.PickList catch (Npgsql.PostgresException e) { //log out the exception and the query + //This may be called internally in *Biz classes who don't have a log of their own + if (log == null) + log = AyaNova.Util.ApplicationLogging.CreateLogger("PickListFetcher"); log.LogInformation("PickList query failed unexpectedly. Query was:"); log.LogInformation(q); log.LogInformation(e, "DB Exception"); diff --git a/server/AyaNova/biz/PartAssemblyBiz.cs b/server/AyaNova/biz/PartAssemblyBiz.cs index 67244b2a..6df11e88 100644 --- a/server/AyaNova/biz/PartAssemblyBiz.cs +++ b/server/AyaNova/biz/PartAssemblyBiz.cs @@ -111,11 +111,13 @@ namespace AyaNova.Biz if (populatePartNames && ret.Items.Count > 0) { - var partIdList = ret.Items.Select(z => z.PartId).ToList(); + var partIdList = ret.Items.Select(z => z.PartId).ToArray(); var PickList = PickListFactory.GetAyaPickList(AyaType.Part); - var partNames = await PickListFetcher.GetResponseAsync(PickList, null, null, true, partIdList, null, ct, log); - - + var partNames = await PickListFetcher.GetResponseAsync(PickList, null, null, true, partIdList, null, ct, null); + foreach (PartAssemblyItem pai in ret.Items) + { + pai.PartDisplay = partNames.Where(z => z.Id == pai.PartId).First().Name; + } } return ret; }