From 6756f97d0cde1423f2a202df2b0754bf3839cc88 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 17 Nov 2017 15:40:36 -0500 Subject: [PATCH] Limit schedule resolvers to active schedules --- common/djangoapps/student/models.py | 2 +- openedx/core/djangoapps/schedules/resolvers.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py index fdfca2721c..a32a2a3306 100644 --- a/common/djangoapps/student/models.py +++ b/common/djangoapps/student/models.py @@ -1760,7 +1760,7 @@ class CourseEnrollment(models.Model): return None try: - if not self.schedule: + if not self.schedule or not self.schedule.active: return None log.debug( diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py index 61f6a7b911..a262b89c58 100644 --- a/openedx/core/djangoapps/schedules/resolvers.py +++ b/openedx/core/djangoapps/schedules/resolvers.py @@ -123,10 +123,12 @@ class BinnedSchedulesBaseResolver(PrefixedDebugLoggerMixin, RecipientResolver): 'enrollment__course', ).filter( Q(enrollment__course__end__isnull=True) | Q( - enrollment__course__end__gte=self.current_datetime), + enrollment__course__end__gte=self.current_datetime + ), self.experience_filter, enrollment__user__in=users, enrollment__is_active=True, + active=True, **schedule_day_equals_target_day_filter ).order_by(order_by)