Skip to content

TD-191 prevent user adding themself as a supervised member of staff #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 10, 2022
Merged

TD-191 prevent user adding themself as a supervised member of staff #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
364de02
supervisor email check
OluwatobiAwe Nov 4, 2022
fa727aa
Wording tweaks
kevwhitt-hee Nov 8, 2022
4b1a75f
removed style white:nowrap for TD-191
OluwatobiAwe Nov 10, 2022
903d941
Merge branch 'Develop/Fixes/TD-191-prevent-supervisor-adding-self-to-…
OluwatobiAwe Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,14 @@ public IActionResult AddSuperviseDelegate(MyStaffListViewModel model)
var supervisorEmail = GetUserEmail();

ModelState.Remove("Page");
if (ModelState.IsValid)
if (ModelState.IsValid && supervisorEmail != model.DelegateEmail)
{
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."); }
ModelState.ClearErrorsForAllFieldsExcept("DelegateEmail");
return MyStaffList(model.SearchString, model.SortBy, model.SortDirection, model.Page);
}
Expand All @@ -131,7 +132,7 @@ public IActionResult AddMultipleSuperviseDelegates(AddMultipleSupervisorDelegate
var delegateEmailsList = NewlineSeparatedStringListHelper.SplitNewlineSeparatedList(model.DelegateEmails);
foreach (var delegateEmail in delegateEmailsList)
{
if (delegateEmail.Length > 0)
if (delegateEmail.Length > 0 && supervisorEmail != delegateEmail)
{
if (RegexStringValidationHelper.IsValidEmail(delegateEmail))
{
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
@using DigitalLearningSolutions.Web.Helpers
@model TextInputViewModel
<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")" style="white-space:nowrap">
<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
<label class="nhsuk-label" for="@Model.Name">
@Model.Label
</label>
Expand Down