Merge branch 'hotfix/LIL-676' into 'master'

LIL-676 Нет проверки прав на странице урока онлайн школы

See merge request lilcity/backend!163

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)
+        self.object = self.get_object()
-        # ??? где проверка?
+        is_purchased = SchoolPayment.objects.filter(
-        #try:
+            user=request.user,
-        #    school_payment = SchoolPayment.objects.get(
+            date_start__lte=now(),
-        #        user=request.user,
+            date_end__gte=now(),
-        #        add_days=False,
+            status__in=[
-        #        date_start__lte=now(),
+               Pingback.PINGBACK_TYPE_REGULAR,
-        #        date_end__gte=now(),
+               Pingback.PINGBACK_TYPE_GOODWILL,
-        #        status__in=[
+               Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
-        #            Pingback.PINGBACK_TYPE_REGULAR,
+            ],
-        #            Pingback.PINGBACK_TYPE_GOODWILL,
+            weekdays__contains=[self.object.date.weekday() + 1],
-        #            Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
+        ).exists()
-        #        ],
+        if not is_purchased and request.user.role not in [User.ADMIN_ROLE, User.TEACHER_ROLE]:
-        #    )
+           raise Http404
-        #except SchoolPayment.DoesNotExist:
+
-        #    school_payment = None
+        context = self.get_context_data(object=self.object)
-        #if request.user.role not in [User.ADMIN_ROLE, User.TEACHER_ROLE] and not (
+        return self.render_to_response(context)
-        #    request.user.role == User.USER_ROLE and
-        #    school_payment and
-        #    school_payment.is_deliverable()
-        #):
-        #    raise Http404
-
-        return response
 
 
 @method_decorator([login_required, is_admin_or_teacher], name='dispatch')