From 3331cccd31f892f55c0d77ce219e012c3601c6d0 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 9 Feb 2023 13:50:24 +0000 Subject: [PATCH] TD-1106 Removes same email validation code --- .../Controllers/SupervisorController/Supervisor.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs index bf6bad505b..d91e2d2e41 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs @@ -100,14 +100,15 @@ public IActionResult AddSuperviseDelegate(MyStaffListViewModel model) var supervisorEmail = GetUserEmail(); ModelState.Remove("Page"); - if (ModelState.IsValid && supervisorEmail != model.DelegateEmail) + //if (ModelState.IsValid && supervisorEmail != model.DelegateEmail) + if (ModelState.IsValid) { AddSupervisorDelegateAndReturnId(adminId, model.DelegateEmail ?? String.Empty, supervisorEmail, centreId); return RedirectToAction("MyStaffList", model.Page); } else { - if (supervisorEmail == model.DelegateEmail) { ModelState.AddModelError("DelegateEmail", "The email address must not match the email address you are logged in with."); } + // if (supervisorEmail == model.DelegateEmail) { ModelState.AddModelError("DelegateEmail", "The email address must not match the email address you are logged in with."); } ModelState.ClearErrorsForAllFieldsExcept("DelegateEmail"); return MyStaffList(model.SearchString, model.SortBy, model.SortDirection, model.Page); } @@ -133,7 +134,8 @@ public IActionResult AddMultipleSuperviseDelegates(AddMultipleSupervisorDelegate var delegateEmailsList = NewlineSeparatedStringListHelper.SplitNewlineSeparatedList(model.DelegateEmails); foreach (var delegateEmail in delegateEmailsList) { - if (delegateEmail.Length > 0 && supervisorEmail != delegateEmail) + //if (delegateEmail.Length > 0 && supervisorEmail != delegateEmail) + if (delegateEmail.Length > 0) { if (RegexStringValidationHelper.IsValidEmail(delegateEmail)) { @@ -867,11 +869,11 @@ public IActionResult QuickAddSupervisor(EnrolDelegateSupervisorRoleViewModel sup SupervisorDelegateDetail = supervisorDelegate, SupervisorRoleName = supervisorRole.SelfAssessmentSupervisorRoleId == null ? "Supervisor" : supervisorService.GetSupervisorRoleById((int)supervisorRole.SelfAssessmentSupervisorRoleId).RoleName, - SupervisorRoleCount = supervisorRole.SelfAssessmentSupervisorRoleId == null + SupervisorRoleCount = supervisorRole.SelfAssessmentSupervisorRoleId == null ? 0 : supervisorService.GetSupervisorRolesForSelfAssessment((int)supervisorRole.SelfAssessmentSupervisorRoleId).Count() }; - return View("SelectDelegateSupervisorRoleSummary",new Tuple(model, supervisorRole.SelfAssessmentSupervisorRoleId)); + return View("SelectDelegateSupervisorRoleSummary", new Tuple(model, supervisorRole.SelfAssessmentSupervisorRoleId)); } }