Skip to content

TD-5329 fix bug with showing error page after upload #3107

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 1 commit into from
Feb 3, 2025
Merged

TD-5329 fix bug with showing error page after upload #3107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
{
Expand Down
Loading