Commit 6756f97d by Calen Pennington

Limit schedule resolvers to active schedules

parent fabad1de
...@@ -1760,7 +1760,7 @@ class CourseEnrollment(models.Model): ...@@ -1760,7 +1760,7 @@ class CourseEnrollment(models.Model):
return None return None
try: try:
if not self.schedule: if not self.schedule or not self.schedule.active:
return None return None
log.debug( log.debug(
......
...@@ -123,10 +123,12 @@ class BinnedSchedulesBaseResolver(PrefixedDebugLoggerMixin, RecipientResolver): ...@@ -123,10 +123,12 @@ class BinnedSchedulesBaseResolver(PrefixedDebugLoggerMixin, RecipientResolver):
'enrollment__course', 'enrollment__course',
).filter( ).filter(
Q(enrollment__course__end__isnull=True) | Q( Q(enrollment__course__end__isnull=True) | Q(
enrollment__course__end__gte=self.current_datetime), enrollment__course__end__gte=self.current_datetime
),
self.experience_filter, self.experience_filter,
enrollment__user__in=users, enrollment__user__in=users,
enrollment__is_active=True, enrollment__is_active=True,
active=True,
**schedule_day_equals_target_day_filter **schedule_day_equals_target_day_filter
).order_by(order_by) ).order_by(order_by)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment