Skip to content

Commit b516c56

Browse files
committed
TD-5163 Fixes navigation and titles
1 parent 5a1ce68 commit b516c56

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,10 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
194194
public IActionResult AddQuestionsToWhichCompetencies()
195195
{
196196
var data = GetBulkUploadData();
197+
if (data.DefaultQuestionIDs.Count ==0 && data.CustomAssessmentQuestionID == null)
198+
{
199+
return RedirectToAction("ImportSummary", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
200+
}
197201
var model = new AddQuestionsToWhichCompetenciesViewModel
198202
(
199203
data.FrameworkId,

DigitalLearningSolutions.Web/Views/Frameworks/Developer/Import/ImportCompleted.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
}
2929
<div class="nhsuk-grid-row">
3030
<div class="nhsuk-grid-column-full">
31-
<h1 class="nhsuk-heading-xl">@Model.FrameworkVocabularySingular.ToLower() file uploaded</h1>
31+
<h1 class="nhsuk-heading-xl">@Model.FrameworkVocabularySingular file uploaded</h1>
3232
<div class="nhsuk-u-reading-width">
3333
<p class="nhsuk-body-l">@(Model.ErrorCount == 0 ? "Your file is error free and ready to be processed. Check the information below looks, correct before processing" : "Your file contains the following, including some errors:")</p>
3434
<ul>

DigitalLearningSolutions.Web/Views/Frameworks/Developer/Import/ImportSummary.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<p>Once @Model.FrameworkVocabularySingular.ToLower() records are processed, changes cannot be undone.</p>
103103
</div>
104104
<form method="post">
105-
<a asp-controller="Frameworks" asp-all-route-data="@cancelLinkData" asp-action="AddQuestionsToWhichCompetencies" role="button" class="nhsuk-button nhsuk-button--secondary">Back</a>
105+
<a asp-controller="Frameworks" asp-all-route-data="@cancelLinkData" asp-action=@(Model.CustomAssessmentQuestionID != null | Model.DefaultAssessmentQuestionIDs.Count > 0 ? "AddQuestionsToWhichCompetencies" : "AddAssessmentQuestions") role="button" class="nhsuk-button nhsuk-button--secondary">Back</a>
106106
<button type="submit" class="nhsuk-button">Process @Model.FrameworkVocabularyPlural.ToLower()</button>
107107
</form>
108108
<vc:cancel-link asp-controller="Frameworks" asp-action="CancelImport" asp-all-route-data="@cancelLinkData" link-text="Cancel" />

0 commit comments

Comments
 (0)