Merge pull request #219 from TechnologyEnhancedLearning/Develop/Fixes/TD-3950

TD-3950 bookmark partial view error bugfix

Author: OluwatobiAwe

LearningHub.Nhs.WebUI/Controllers/HomeController.cs

@@ -246,17 +246,29 @@ public async Task<IActionResult> LoadPage(string dashBoardTray = "my-learning",
                     Catalogues = new Nhs.Models.Dashboard.DashboardCatalogueResponseViewModel { Type = catalogueDashBoard },
                 };
 
-                switch (dashBoardTray)
+                bool isAjax = this.HttpContext.Request.Headers["X-Requested-With"] == "XMLHttpRequest";
+
+                if (isAjax)
                 {
-                    case "my-learning":
-                        model.MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, pageNumber);
-                        return this.PartialView("_MyAccessedLearningTray", model);
-                    case "resources":
-                        model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, pageNumber);
-                        return this.PartialView("_ResourceTray", model);
-                    case "catalogues":
-                        model.Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashBoard, pageNumber);
-                        return this.PartialView("_CatalogueTray", model);
+                    switch (dashBoardTray)
+                    {
+                        case "my-learning":
+                            model.MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, pageNumber);
+                            return this.PartialView("_MyAccessedLearningTray", model);
+                        case "resources":
+                            model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, pageNumber);
+                            return this.PartialView("_ResourceTray", model);
+                        case "catalogues":
+                            model.Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashBoard, pageNumber);
+                            return this.PartialView("_CatalogueTray", model);
+                    }
+                }
+                else
+                {
+                    model.MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, dashBoardTray == "my-learning" ? pageNumber : 1);
+                    model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, dashBoardTray == "resources" ? pageNumber : 1);
+                    model.Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashBoard, dashBoardTray == "catalogues" ? pageNumber : 1);
+                    return this.View("Dashboard", model);
                 }
             }