Merge pull request #2661 from TechnologyEnhancedLearning/Develop/Fixes/TD-3885-FixingIssueWithPropmtsFilter

TD-3885 Fixing issue with prompts filter

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/AllDelegatesController.cs

@@ -97,12 +97,12 @@ public IActionResult Index(
 
             var CurrentSiteBaseUrl = configuration.GetCurrentSystemBaseUrl();
 
-            if (TempData["allDelegatesCentreId"] != null && TempData["allDelegatesCentreId"].ToString() != User.GetCentreId().ToString()
-                    && existingFilterString != null &&(TempData["LastBaseUrl"].ToString() != CurrentSiteBaseUrl))
+            if (((TempData["allDelegatesCentreId"] != null && TempData["allDelegatesCentreId"].ToString() != User.GetCentreId().ToString())
+                     || (TempData["LastBaseUrl"] != null && (TempData["LastBaseUrl"].ToString() != CurrentSiteBaseUrl))) && existingFilterString != null)
             {
                 if (existingFilterString.Contains("Answer"))
                     existingFilterString = FilterHelper.RemoveNonExistingPromptFilters(availableFilters, existingFilterString);
-                if (existingFilterString.Contains("DelegateGroup"))
+                if (existingFilterString != null && existingFilterString.Contains("DelegateGroup"))
                     existingFilterString = FilterHelper.RemoveNonExistingFilterOptions(availableFilters, existingFilterString);
             }