Merge pull request #3107 from TechnologyEnhancedLearning/Develop/Fixes/TD-5329-FixGetFrameworkAdminRolesBug

TD-5329 fix bug with showing error page after upload

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs

@@ -53,7 +53,10 @@ public IActionResult StartImport(ImportCompetenciesFormData model, int framework
                 if (!workbook.Worksheets.Contains(ImportCompetenciesFromFileService.CompetenciesSheetName))
                 {
                     ModelState.AddModelError("ImportFile", CommonValidationErrorMessages.InvalidCompetenciesUploadExcelFile);
-                    return View("Developer/Import/Index", model);
+                    var adminId = GetAdminId();
+                    var framework = frameworkService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
+                    var viewModel = new ImportCompetenciesViewModel(framework, isNotBlank);
+                    return View("Developer/Import/Index", viewModel);
                 }
                 var competenciesFileName = FileHelper.UploadFile(webHostEnvironment, model.ImportFile);
                 setupBulkUploadData(frameworkId, adminUserID, competenciesFileName, tabname, isNotBlank);
@@ -63,7 +66,10 @@ public IActionResult StartImport(ImportCompetenciesFormData model, int framework
             catch (DocumentFormat.OpenXml.Packaging.OpenXmlPackageException)
             {
                 ModelState.AddModelError("DelegatesFile", "The Excel file has at least one cell containing an invalid hyperlink or email address.");
-                return View("Index", model);
+                var adminId = GetAdminId();
+                var framework = frameworkService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
+                var viewModel = new ImportCompetenciesViewModel(framework, isNotBlank);
+                return View("Developer/Import/Index", viewModel);
             }
             catch (InvalidHeadersException)
             {