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-05-10 21:45:59 +00:00
parent a87d3ecb35
commit c465716f11
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/AyaNova/Controllers/WorkOrderController.cs
View File

@@ -264,10 +264,10 @@ namespace AyaNova.Api.Controllers
/// <summary> /// <summary>
/// Delete WorkOrderItem /// Delete WorkOrderItem
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="WorkOrderItemId"></param>
/// <returns>NoContent</returns> /// <returns>NoContent</returns>
[HttpDelete("{id}")] [HttpDelete("items/{WorkOrderItemId}")]
public async Task<IActionResult> DeleteWorkOrderItem([FromRoute] long id) public async Task<IActionResult> DeleteWorkOrderItem([FromRoute] long WorkOrderItemId)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
@@ -276,7 +276,7 @@ namespace AyaNova.Api.Controllers
WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext); WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasDeleteRole(HttpContext.Items, AyaType.WorkOrderItem)) if (!Authorized.HasDeleteRole(HttpContext.Items, AyaType.WorkOrderItem))
return StatusCode(403, new ApiNotAuthorizedResponse()); return StatusCode(403, new ApiNotAuthorizedResponse());
if (!await biz.ItemDeleteAsync(id)) if (!await biz.ItemDeleteAsync(WorkOrderItemId))
return BadRequest(new ApiErrorResponse(biz.Errors)); return BadRequest(new ApiErrorResponse(biz.Errors));
return NoContent(); return NoContent();
} }

6
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -436,11 +436,13 @@ namespace AyaNova.Biz
//Delete children //Delete children
foreach (long l in LaborIds) foreach (long l in LaborIds)
{ {
if (!await LaborDeleteAsync(id)) return false; if (!await LaborDeleteAsync(id))
return false;
} }
foreach (long l in PartIds) foreach (long l in PartIds)
{ {
if (!await LaborDeleteAsync(id)) return false; if (!await PartDeleteAsync(id))
return false;
} }
ct.WorkOrderItem.Remove(dbObject); ct.WorkOrderItem.Remove(dbObject);