From 24919ea7596b8a7c1a7eeb9cce2fbb2b63630c7b Mon Sep 17 00:00:00 2001 From: Sherif Olaboye Date: Thu, 15 Aug 2024 11:03:44 +0100 Subject: [PATCH 1/2] TD-4539 Issue showing console '500' error on the screen when clicked browser back button after processing the Bulk Upload registration --- .../TrackingSystem/Delegates/BulkUploadController.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs index 862bb67f95..eb181ff7b5 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs @@ -147,6 +147,10 @@ public IActionResult UploadComplete() [Route("WelcomeEmail")] public IActionResult WelcomeEmail() { + if (!TempData.Any()) + { + return RedirectToAction("StatusCode", "LearningSolutions", new { code = 401 }); + } var data = GetBulkUploadData(); var model = new WelcomeEmailViewModel() { Day = data.Day, Month = data.Month, Year = data.Year, DelegatesToRegister = data.ToRegisterActiveCount + data.ToRegisterInactiveCount }; return View(model); @@ -265,6 +269,10 @@ public IActionResult SubmitAddWhoToGroup(AddWhoToGroupViewModel model) [Route("UploadSummary")] public IActionResult UploadSummary() { + if (!TempData.Any()) + { + return RedirectToAction("StatusCode", "LearningSolutions", new { code = 401 }); + } var data = GetBulkUploadData(); var centreId = User.GetCentreIdKnownNotNull(); string? groupName; @@ -295,6 +303,10 @@ public IActionResult UploadSummary() [HttpPost] public IActionResult StartProcessing() { + if (!TempData.Any()) + { + return RedirectToAction("StatusCode", "LearningSolutions", new { code = 401 }); + } var centreId = User.GetCentreIdKnownNotNull(); var data = GetBulkUploadData(); var adminId = User.GetAdminIdKnownNotNull(); From 65025b0f4988417199f835da5c5f8c13c3f7b07c Mon Sep 17 00:00:00 2001 From: Sherif Olaboye Date: Wed, 21 Aug 2024 10:43:09 +0100 Subject: [PATCH 2/2] TD-4539 changing the error code --- .../TrackingSystem/Delegates/BulkUploadController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs index eb181ff7b5..c8e078e24d 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs @@ -149,7 +149,7 @@ public IActionResult WelcomeEmail() { if (!TempData.Any()) { - return RedirectToAction("StatusCode", "LearningSolutions", new { code = 401 }); + return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 }); } var data = GetBulkUploadData(); var model = new WelcomeEmailViewModel() { Day = data.Day, Month = data.Month, Year = data.Year, DelegatesToRegister = data.ToRegisterActiveCount + data.ToRegisterInactiveCount }; @@ -271,7 +271,7 @@ public IActionResult UploadSummary() { if (!TempData.Any()) { - return RedirectToAction("StatusCode", "LearningSolutions", new { code = 401 }); + return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 }); } var data = GetBulkUploadData(); var centreId = User.GetCentreIdKnownNotNull(); @@ -305,7 +305,7 @@ public IActionResult StartProcessing() { if (!TempData.Any()) { - return RedirectToAction("StatusCode", "LearningSolutions", new { code = 401 }); + return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 }); } var centreId = User.GetCentreIdKnownNotNull(); var data = GetBulkUploadData();