Skip to content

Commit d48dd4b

Browse files
committed
TD-4339- null/empty check added for centre name
1 parent 69970db commit d48dd4b

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,18 +233,20 @@ public IActionResult EditCentreDetails(int centreId = 0)
233233
[Route("SuperAdmin/Centres/{centreId=0:int}/EditCentreDetails")]
234234
public IActionResult EditCentreDetails(EditCentreDetailsSuperAdminViewModel model)
235235
{
236-
var centres = centresService.GetAllCentres().ToList();
237-
bool isExistingCentreName = centres.Where(center => center.Item1 == model.CentreId)
238-
.Select(center => center.Item2)
239-
.FirstOrDefault()
240-
.Equals(model.CentreName.Trim());
241-
bool isCentreNamePresent = centres.Any(center => string.Equals(center.Item2.Trim(), model.CentreName?.Trim(), StringComparison.OrdinalIgnoreCase));
242-
243-
if (isCentreNamePresent && !isExistingCentreName)
236+
if (!string.IsNullOrEmpty(model.CentreName))
244237
{
245-
ModelState.AddModelError("CentreName", CommonValidationErrorMessages.CentreNameAlreadyExist);
246-
}
238+
var centres = centresService.GetAllCentres().ToList();
239+
bool isExistingCentreName = centres.Where(center => center.Item1 == model.CentreId)
240+
.Select(center => center.Item2)
241+
.FirstOrDefault()
242+
.Equals(model.CentreName.Trim());
243+
bool isCentreNamePresent = centres.Any(center => string.Equals(center.Item2.Trim(), model.CentreName?.Trim(), StringComparison.OrdinalIgnoreCase));
247244

245+
if (isCentreNamePresent && !isExistingCentreName)
246+
{
247+
ModelState.AddModelError("CentreName", CommonValidationErrorMessages.CentreNameAlreadyExist);
248+
}
249+
}
248250
if (!ModelState.IsValid)
249251
{
250252
var regions = regionService.GetRegionsAlphabetical().ToList();

0 commit comments

Comments
 (0)