Merge branch 'hotfix/dev-courses-26-8' into 'master'

Баг / При открытии урока школы 500 ошибка

See merge request lilschool/site!398
remotes/origin/hotfix/anchor-5-9-19
Danil 6 years ago
commit 3e7ce66049
  1. 8
      apps/school/views.py

@ -103,14 +103,14 @@ class LiveLessonsDetailView(DetailView):
raise Http404()
if request.user.is_authenticated:
if self.object.is_camp:
is_purchased = DrawingCampPayment.objects.all()
is_purchased = DrawingCampPayment.objects.paid()
else:
is_purchased = SchoolPayment.objects.filter(weekdays__contains=[self.object.date.weekday() + 1],)
is_purchased = is_purchased.paid().filter(
is_purchased = SchoolPayment.objects.paid().filter(weekdays__contains=[self.object.date.weekday() + 1],)
is_purchased = is_purchased.filter(
user=request.user,
date_start__lte=now(),
date_end__gte=now() - timedelta(days=7),
).exists() or is_purchased.paid().filter(
).exists() or is_purchased.filter(
user=request.user,
date_start__lte=now(),
date_end__gte=now() - timedelta(days=30),

Loading…
Cancel
Save