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..9ee47ad8 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 %}