Limit schedule resolvers to active schedules

This commit is contained in:
Calen Pennington
2017-11-17 15:40:36 -05:00
parent fabad1de4d
commit 6756f97d0c
2 changed files with 4 additions and 2 deletions

View File

@@ -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(

View File

@@ -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)