Skip to content

Commit eafb99b

Browse files
TD-4893 Delegate activities - view course delegates resulted in 500 error when course admin field applied filters got deleted
1 parent 70c2531 commit eafb99b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

DigitalLearningSolutions.Data/Helpers/FilteringHelper.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ public static string GetFilterValueForRegistrationPrompt(int promptNumber, strin
170170
public static string? CheckIfFilterisValid(bool clearFilters, string existingFilterString, string newFilterToAdd, IEnumerable<FilterModel> availableFilters, HttpRequest request,
171171
string cookieName, HttpResponse response)
172172
{
173-
if (!request.Cookies.ContainsKey(cookieName) || string.IsNullOrEmpty(request.Cookies[cookieName]) || clearFilters)
174-
return null;
175-
173+
176174
var cookieValue = request.Cookies[cookieName];
177175
if (string.IsNullOrEmpty(cookieValue) || cookieValue == EmptyFiltersCookieValue)
178176
{

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,10 @@ public IActionResult Index(
275275
var activityName = isCourseDelegate
276276
? courseService.GetCourseNameAndApplication((int)customisationId).CourseName
277277
: selfAssessmentService.GetSelfAssessmentNameById((int)selfAssessmentId);
278-
existingFilterString = FilteringHelper.CheckIfFilterisValid(clearFilters, existingFilterString, newFilterToAdd, availableFilters, Request, filterCookieName, Response);
278+
if (!string.IsNullOrEmpty(existingFilterString))
279+
{
280+
existingFilterString = FilteringHelper.CheckIfFilterisValid(clearFilters, existingFilterString, newFilterToAdd, availableFilters, Request, filterCookieName, Response);
281+
}
279282
if (isCourseDelegate)
280283
{
281284
var result = paginateService.Paginate(

0 commit comments

Comments
 (0)