From f76dba56f7191e2f553f9e4e45bbff2b399841f9 Mon Sep 17 00:00:00 2001 From: yourcoke <deinkoks@gmail.com> Date: Wed, 23 Dec 2020 11:15:59 +0100 Subject: [PATCH] Revert unintended change in template names. --- src/plainui/views.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/plainui/views.py b/src/plainui/views.py index 97bff7839..fc8c7c4e4 100644 --- a/src/plainui/views.py +++ b/src/plainui/views.py @@ -25,7 +25,7 @@ from django.views.generic.edit import FormView, UpdateView from core import integrations from core.forms import PasswordResetForm from core.models import Assembly, AssemblyLikeCount, Badge, Conference, ConferenceTag, ConferenceTrack, DirectMessage, Event, \ - EventLikeCount, EventParticipant, PlatformUser, Room, RoomLink, StaticPage, TagItem, UserBadge + EventLikeCount, EventParticipant, PlatformUser, Room, RoomLink, StaticPage, TagItem, UserBadge from core.search import search from core.utils import render_markdown @@ -250,7 +250,9 @@ class AssemblyView(ConferenceRequiredMixin, TemplateView): context['scope'] = 'assembly' context['can_create_sos'] = assembly.has_user(self.request.user) or assembly == self.conf.self_organized_sessions_assembly context['sos'] = assembly.events.filter(is_public=True, kind=Event.Kind.SELF_ORGANIZED) - context['suggested'] = [s.assembly2 for s in assembly.suggestions.select_related('assembly2').exclude(assembly2=assembly.pk).order_by('-like_ratio')[:5]] + context['suggested'] = [s.assembly2 for s in assembly.suggestions.select_related('assembly2') + .exclude(assembly2=assembly.pk) + .order_by('-like_ratio')[:5]] can_manage_sos = context['can_manage_sos'] = assembly.user_can_manage(self.request.user) if can_manage_sos: @@ -738,7 +740,7 @@ class PasswordResetView(ConferenceRequiredMixin, auth_views.PasswordResetView): class PasswordResetDoneView(ConferenceRequiredMixin, auth_views.PasswordResetDoneView): - template_name = 'plainui/reset_password_done.html' + template_name = 'plainui/password_reset_done.html' require_conference_member = False require_login = False @@ -765,7 +767,7 @@ class PasswordResetConfirmView(ConferenceRequiredMixin, auth_views.PasswordReset class PasswordResetCompleteView(ConferenceRequiredMixin, auth_views.PasswordResetCompleteView): - template_name = 'plainui/reset_password_complete.html' + template_name = 'plainui/password_reset_complete.html' require_conference_member = False require_login = False @@ -948,10 +950,10 @@ def _event_filter(user, conf, day=None, curated=None, assembly=None, track=None, now = timezone.now() events = events.filter(Q(schedule_start__lt=now, schedule_end__gte=now) | Q(schedule_start__gte=now, schedule_start__lt=now + UPCOMING_WINDOW)) return events.filter( - room__isnull=False, - schedule_duration__isnull=False, - **filters - ).exclude(kind=Event.Kind.SELF_ORGANIZED).order_by('schedule_start') + room__isnull=False, + schedule_duration__isnull=False, + **filters + ).exclude(kind=Event.Kind.SELF_ORGANIZED).order_by('schedule_start') class FahrplanView(ConferenceRequiredMixin, TemplateView): -- GitLab