diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs index b64891ec12..4aac5ee437 100644 --- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs +++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs @@ -656,7 +656,7 @@ public IActionResult AddCollaborators(string actionname, int frameworkId, bool e { BaseFramework = framework, Collaborators = collaborators, - Error = error, + Error = false, }; return View("Developer/Collaborators", model); } @@ -673,7 +673,24 @@ public IActionResult AddCollaborator(string actionname, string userEmail, bool c } else { - return RedirectToAction("AddCollaborators", "Frameworks", new { frameworkId, actionname, error = true }); + if (collaboratorId == -3) + { + TempData["FrameworkError"] = "Email address should not be empty"; + + } + else if (collaboratorId == -2) + { + TempData["FrameworkError"] = $"User with the email address {userEmail} has been previously added"; + } + else if (collaboratorId == -4) + { + TempData["FrameworkError"] = $"The email address {userEmail} must match registered DLS Admin account"; + } + else + { + TempData["FrameworkError"] = "User not added,Kindly try again;"; + } + return RedirectToAction("AddCollaborators", "Frameworks", new { frameworkId, actionname }); } } diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Collaborators.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Collaborators.cshtml index 7bbba52c64..b41d1e3c69 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Collaborators.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Collaborators.cshtml @@ -4,6 +4,8 @@ ViewData["Title"] = "Framework Collaborators"; ViewData["Application"] = "Framework Service"; ViewData["HeaderPathName"] = "Framework Service"; + string errMsg = TempData["FrameworkError"]?.ToString(); + if (!string.IsNullOrWhiteSpace(errMsg)) { Model.Error = true; } } @section NavMenuItems { @@ -59,6 +61,12 @@ else {

Your framework has been created. Use this page to identify individuals who will be working on it with you.

} +@if (Model.Error) +{ + + Error: @errMsg + +}

Working Group Members

@@ -118,7 +126,7 @@ else
-