Skip to content

Commit 9dae1ce

Browse files
committed
TD-3885 FixingIssue with propmts filter
1 parent 95f78c9 commit 9dae1ce

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ public IActionResult Index(
9797

9898
var CurrentSiteBaseUrl = configuration.GetCurrentSystemBaseUrl();
9999

100-
if (TempData["allDelegatesCentreId"] != null && TempData["allDelegatesCentreId"].ToString() != User.GetCentreId().ToString()
101-
&& existingFilterString != null &&(TempData["LastBaseUrl"].ToString() != CurrentSiteBaseUrl))
100+
if (((TempData["allDelegatesCentreId"] != null && TempData["allDelegatesCentreId"].ToString() != User.GetCentreId().ToString())
101+
|| (TempData["LastBaseUrl"].ToString() != CurrentSiteBaseUrl)) && existingFilterString != null)
102102
{
103103
if (existingFilterString.Contains("Answer"))
104104
existingFilterString = FilterHelper.RemoveNonExistingPromptFilters(availableFilters, existingFilterString);
105-
if (existingFilterString.Contains("DelegateGroup"))
105+
if (existingFilterString != null && existingFilterString.Contains("DelegateGroup"))
106106
existingFilterString = FilterHelper.RemoveNonExistingFilterOptions(availableFilters, existingFilterString);
107107
}
108108

0 commit comments

Comments
 (0)