Skip to content

Commit 52a47de

Browse files
TD-2865: File selected check included
1 parent 3284e0f commit 52a47de

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/BulkUploadController.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,19 @@ public IActionResult StartUpload()
8080
public IActionResult StartUpload(UploadDelegatesViewModel model)
8181
{
8282
int MaxBulkUploadRows = GetMaxBulkUploadRowsLimit();
83-
var workbook = new XLWorkbook(model.DelegatesFile.OpenReadStream());
84-
if (!workbook.Worksheets.Contains(DelegateDownloadFileService.DelegatesSheetName))
83+
if (model.DelegatesFile != null)
8584
{
86-
ModelState.AddModelError("MaxBulkUploadRows", CommonValidationErrorMessages.InvalidExcelValidationMessage);
87-
return View("StartUpload", model);
88-
}
89-
int ExcelRowsCount = delegateUploadFileService.GetBulkUploadExcelRowCount(model.DelegatesFile);
90-
if (ExcelRowsCount > MaxBulkUploadRows)
91-
{
92-
ModelState.AddModelError("MaxBulkUploadRows", string.Format(CommonValidationErrorMessages.MaxBulkUploadRowsLimit, MaxBulkUploadRows));
85+
var workbook = new XLWorkbook(model.DelegatesFile.OpenReadStream());
86+
if (!workbook.Worksheets.Contains(DelegateDownloadFileService.DelegatesSheetName))
87+
{
88+
ModelState.AddModelError("MaxBulkUploadRows", CommonValidationErrorMessages.InvalidExcelValidationMessage);
89+
return View("StartUpload", model);
90+
}
91+
int ExcelRowsCount = delegateUploadFileService.GetBulkUploadExcelRowCount(model.DelegatesFile);
92+
if (ExcelRowsCount > MaxBulkUploadRows)
93+
{
94+
ModelState.AddModelError("MaxBulkUploadRows", string.Format(CommonValidationErrorMessages.MaxBulkUploadRowsLimit, MaxBulkUploadRows));
95+
}
9396
}
9497
if (!ModelState.IsValid)
9598
{

0 commit comments

Comments
 (0)