From f946a472b1dd69c9b6b50c469240914f8622e573 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 10 Nov 2021 23:58:00 +0000 Subject: [PATCH] User ValidateCanDelete switched to checking all references from only event log --- .vscode/launch.json | 2 +- server/AyaNova/biz/QuoteStatusBiz.cs | 2 +- server/AyaNova/biz/UserBiz.cs | 8 ++++---- server/AyaNova/resource/en.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 924c5283..dde42e99 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -55,7 +55,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\" diff --git a/server/AyaNova/biz/QuoteStatusBiz.cs b/server/AyaNova/biz/QuoteStatusBiz.cs index 492f2b09..a0b5abeb 100644 --- a/server/AyaNova/biz/QuoteStatusBiz.cs +++ b/server/AyaNova/biz/QuoteStatusBiz.cs @@ -208,7 +208,7 @@ namespace AyaNova.Biz //Referential integrity //FOREIGN KEY CHECKS if (await ct.QuoteState.AnyAsync(m => m.QuoteStatusId == inObj.Id)) - AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("QuoteStatus")); + AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("QuoteQuoteStatusType")); } diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index 1736e53c..49d5e97a 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -878,7 +878,7 @@ namespace AyaNova.Biz if (await ct.PurchaseOrderItem.AnyAsync(m => m.PartRequestedById == inObj.Id)) AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("PurchaseOrderItem")); if (await ct.WorkOrderState.AnyAsync(m => m.UserId == inObj.Id)) - AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderState")); + AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderStatus")); if (await ct.WorkOrderItemExpense.AnyAsync(m => m.UserId == inObj.Id)) AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItemExpense")); if (await ct.WorkOrderItemLabor.AnyAsync(m => m.UserId == inObj.Id)) @@ -891,12 +891,12 @@ namespace AyaNova.Biz AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItemTask")); if (await ct.WorkOrderItemTravel.AnyAsync(m => m.UserId == inObj.Id)) AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItemTravel")); - if (await ct.Quote.AnyAsync(m => m.PreparedById == inObj.Id)) - AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("Quote")); var quotetext = await Translate("Quote"); var pmtext = await Translate("PM"); + if (await ct.Quote.AnyAsync(m => m.PreparedById == inObj.Id)) + AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", quotetext); if (await ct.QuoteState.AnyAsync(m => m.UserId == inObj.Id)) - AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("QuoteState")); + AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("QuoteQuoteStatusType")); if (await ct.QuoteItemExpense.AnyAsync(m => m.UserId == inObj.Id)) AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", quotetext + " - " + await Translate("WorkOrderItemExpense")); if (await ct.QuoteItemLabor.AnyAsync(m => m.UserId == inObj.Id)) diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 8cfd6bb2..20bc3b44 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1615,7 +1615,7 @@ "QuotePreparedByID": "Prepared by User", "QuoteQuoteNumber": "Quote Number", "QuoteQuoteRequestDate": "Requested", - "QuoteQuoteStatusType": "Status", + "QuoteQuoteStatusType": "Quote Status", "QuoteStatusList":"Quote status list", "QuoteServiceWorkOrderID": "Service Work order", "QuoteValidUntilDate": "Valid Until",