From 01e25c1d08194f7d20ac6d515ef3f628739868e6 Mon Sep 17 00:00:00 2001 From: gzbender Date: Mon, 1 Apr 2019 14:45:21 +0500 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC?= =?UTF-8?q?=D1=8B=20=D1=81=20=D0=B2=D0=BE=D1=81=D0=BF=D1=80=D0=BE=D0=B8?= =?UTF-8?q?=D0=B7=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D1=83?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/auth/views.py | 10 +++++---- .../templates/school/livelesson_detail.html | 21 +++++++++++++++++-- apps/school/views.py | 5 ++++- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/apps/auth/views.py b/apps/auth/views.py index c9ae8dfc..5db4d77c 100644 --- a/apps/auth/views.py +++ b/apps/auth/views.py @@ -9,13 +9,14 @@ from facepy.exceptions import FacepyError from django.contrib.auth import get_user_model, logout, login, views from django.contrib.auth.forms import AuthenticationForm from django.core.files.base import ContentFile -from django.http import JsonResponse +from django.http import JsonResponse, Http404 from django.urls import reverse_lazy from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_exempt from django.views.generic import FormView, View, TemplateView from django.views.generic.edit import BaseFormView from django.shortcuts import redirect +from django.conf import settings from apps.notification.utils import send_email from apps.config.models import Config @@ -126,15 +127,16 @@ class PasswordResetView(views.PasswordContextMixin, BaseFormView): title = 'Password reset' token_generator = views.default_token_generator + def get(self, *args, **kwargs): + raise Http404() + def form_valid(self, form): - refferer = urlsplit(self.request.META.get('HTTP_REFERER')) - refferer = str(refferer[0]) + '://' + str(refferer[1]) config = Config.load() extra_email_context = {'config': config} if self.extra_email_context and isinstance(self.extra_email_context, dict): extra_email_context.update(self.extra_email_context) opts = { - 'domain_override': refferer, + 'domain_override': 'https://' + settings.MAIN_HOST, 'use_https': self.request.is_secure(), 'token_generator': self.token_generator, 'from_email': self.from_email, diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html index 095dbb01..35ca19df 100644 --- a/apps/school/templates/school/livelesson_detail.html +++ b/apps/school/templates/school/livelesson_detail.html @@ -15,6 +15,12 @@ {% if livelesson.cover and livelesson.cover.image %}{{ livelesson.cover.image.height }}{% else %}{{ block.super }}{% endif %} {% endblock ogimage-height %} +{% block head %} + {% if livelesson.stream_index %} + + {% endif %} +{% endblock head %} + {% block content %}
@@ -23,8 +29,9 @@
{{ livelesson.short_description | safe | linebreaks }}
{% if livelesson.stream_index %} - Если видео не загрузилось, - уменьшите качество видео или обновите страницу @@ -51,3 +58,13 @@
{% endblock content %} + +{% block foot %} + {% if livelesson.stream_index %} + + {% endif %} +{% endblock foot %} diff --git a/apps/school/views.py b/apps/school/views.py index 3dc0f01a..7651b71a 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -65,7 +65,10 @@ class LiveLessonsDetailView(DetailView): if pk: self.object = self.get_object() if lesson_date: - self.object = LiveLesson.objects.get(date=datetime.strptime(lesson_date, '%d-%m-%y')) + try: + self.object = LiveLesson.objects.get(date=datetime.strptime(lesson_date, '%d-%m-%y')) + except Exception: + raise Http404() if request.user.is_authenticated: is_purchased = SchoolPayment.objects.filter( user=request.user, From b3ac65c96bf10b4eef63314571704188b64737a5 Mon Sep 17 00:00:00 2001 From: Mikhail Lavkin Date: Mon, 1 Apr 2019 10:07:45 +0000 Subject: [PATCH 2/3] Update requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 74e6adb7..1664d832 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,6 +39,7 @@ flower==0.9.2 unidecode factory-boy==2.11.1 pyvirtualdisplay==0.2.1 +tornado==5.1.1 selenium # sudo apt-get install xvfb # sudo apt-get install libappindicator3-1 fonts-liberation From 32f67e17ced1de7479bd817296391848c95d36eb Mon Sep 17 00:00:00 2001 From: gzbender Date: Mon, 1 Apr 2019 15:36:45 +0500 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC?= =?UTF-8?q?=D1=8B=20=D1=81=20=D0=B2=D0=BE=D1=81=D0=BF=D1=80=D0=BE=D0=B8?= =?UTF-8?q?=D0=B7=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D1=83?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/school/livelesson_detail.html | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html index 35ca19df..9ee47ad8 100644 --- a/apps/school/templates/school/livelesson_detail.html +++ b/apps/school/templates/school/livelesson_detail.html @@ -64,7 +64,25 @@ {% endif %} {% endblock foot %}