Merge pull request #1524 from TechnologyEnhancedLearning/Develop/Fixes/TD-6429-LMS-Error-Occurring-in-Test-Environment-While-Launching-SCORM-Content

SIT fixes

Author: AnjuJose011

AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs

@@ -20,6 +20,7 @@
     using System.Collections.Generic;
     using System.Drawing;
     using System.Linq;
+    using System.Net;
     using System.Text.RegularExpressions;
     using System.Threading.Tasks;
 
@@ -282,7 +283,10 @@ public async Task<IActionResult> MoodleCategory(int id)
 
             // Build hierarchical select list
             var selectList = BuildList(categories, parentId: null, depth: 0);
-
+            foreach (var item in selectList)
+            {
+                item.Text = WebUtility.HtmlDecode(item.Text);
+            }
             vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
             this.ViewData["CatalogueName"] = vm.Name;
             this.ViewData["id"] = id;
@@ -736,6 +740,12 @@ public async Task<IActionResult> AddCategoryToCatalogue(CatalogueViewModel catal
                 vm.MoodleCategories = categories;
                 // Build hierarchical select list
                 var selectList = BuildList(categories, parentId: null, depth: 0);
+      
+                foreach (var item in selectList)
+                {
+                    item.Text = WebUtility.HtmlDecode(item.Text);
+                }
+
                 vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
                 return this.View("MoodleCategory", vm);
             }
@@ -766,6 +776,10 @@ public async Task<IActionResult> RemoveCategoryFromCatalogue(int categoryId, int
                 vm.SelectedCategoryId = 0;
                 // Build hierarchical select list
                 var selectList = BuildList(categories, parentId: null, depth: 0);
+                foreach (var item in selectList)
+                {
+                    item.Text = WebUtility.HtmlDecode(item.Text);
+                }
                 vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
                 return this.View("MoodleCategory", vm);
             }

LearningHub.Nhs.WebUI/Views/Catalogue/Courses.cshtml

@@ -20,7 +20,7 @@
                 <div class="nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-2">
                     <h2 class="folder-title line-clamp-2">
                         <img src="/images/folder-icon.svg" alt="folder icon" />
-                        <a asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-moodleCategoryId="@item.Id">@item.Name</a>
+                        <a asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-moodleCategoryId="@item.Id">@Html.Raw(@item.Name)</a>
                     </h2>
                 </div>
                 <hr class="nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-0" />

LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml

@@ -51,7 +51,7 @@
                 return "Search catalogue";
             case "browse":
             default:
-                return "Browse";
+                return "Resources";
         }
     }
     if (Model.Catalogue.SelectedCategoryId == 0 ||
@@ -116,7 +116,7 @@
 
         @* Catalogue header *@
         <div class="nhsuk-u-margin-bottom-7">
-            <partial name="_Breadcrumbs" model="new BreadcrumbViewModel { Breadcrumbs = breadcrumbs, ShowBackToParentOnMobile = true }" />
+            <partial name="_Breadcrumbs" model="new BreadcrumbViewModel { Breadcrumbs = breadcrumbs, ShowBackToParentOnMobile = false }" />
             @if (Model.Catalogue.Hidden)
             {
                 <div class="nhsuk-u-margin-bottom-4">