From 34557fbb20422b1a16b83776e018de5ea8ae8325 Mon Sep 17 00:00:00 2001 From: gzbender Date: Thu, 27 Sep 2018 17:45:40 +0500 Subject: [PATCH] =?UTF-8?q?LIL-676=20=D0=9D=D0=B5=D1=82=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D0=B5=20=D1=83=D1=80=D0=BE=D0=BA=D0=B0=20=D0=BE=D0=BD=D0=BB?= =?UTF-8?q?=D0=B0=D0=B9=D0=BD=20=D1=88=D0=BA=D0=BE=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/views.py | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/apps/school/views.py b/apps/school/views.py index bac97f5a..bdb3a848 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -63,30 +63,23 @@ class LiveLessonsDetailView(DetailView): template_name = 'school/livelesson_detail.html' def get(self, request, pk=None): - response = super().get(request, pk=pk) - # ??? где проверка? - #try: - # school_payment = SchoolPayment.objects.get( - # user=request.user, - # add_days=False, - # date_start__lte=now(), - # date_end__gte=now(), - # status__in=[ - # Pingback.PINGBACK_TYPE_REGULAR, - # Pingback.PINGBACK_TYPE_GOODWILL, - # Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED, - # ], - # ) - #except SchoolPayment.DoesNotExist: - # school_payment = None - #if request.user.role not in [User.ADMIN_ROLE, User.TEACHER_ROLE] and not ( - # request.user.role == User.USER_ROLE and - # school_payment and - # school_payment.is_deliverable() - #): - # raise Http404 - - return response + self.object = self.get_object() + is_purchased = SchoolPayment.objects.filter( + user=request.user, + date_start__lte=now(), + date_end__gte=now(), + status__in=[ + Pingback.PINGBACK_TYPE_REGULAR, + Pingback.PINGBACK_TYPE_GOODWILL, + Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED, + ], + weekdays__contains=[self.object.date.weekday() + 1], + ).exists() + if not is_purchased and request.user.role not in [User.ADMIN_ROLE, User.TEACHER_ROLE]: + raise Http404 + + context = self.get_context_data(object=self.object) + return self.render_to_response(context) @method_decorator([login_required, is_admin_or_teacher], name='dispatch')