Skip to content

Commit 7a422e8

Browse files
committed
Changed the week_view() function to calculate a first_regular_session_time also when the meeting has not been populated with any sessions, by using the meeting.date as a proxy value.
- Legacy-Id: 18410
1 parent 45eaa18 commit 7a422e8

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

ietf/meeting/views.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
from tempfile import mkstemp
2424
from wsgiref.handlers import format_date_time
2525

26-
import debug # pyflakes:ignore
27-
2826
from django import forms
2927
from django.shortcuts import render, redirect, get_object_or_404
3028
from django.http import HttpResponse, HttpResponseRedirect, Http404
@@ -46,6 +44,8 @@
4644
from django.views.decorators.csrf import ensure_csrf_cookie, csrf_exempt
4745
from django.views.generic import RedirectView
4846

47+
import debug # pyflakes:ignore
48+
4949
from ietf.doc.fields import SearchableDocumentsField
5050
from ietf.doc.models import Document, State, DocEvent, NewRevisionDocEvent, DocAlias
5151
from ietf.group.models import Group
@@ -91,6 +91,7 @@
9191
from ietf.utils.pdf import pdf_pages
9292
from ietf.utils.response import permission_denied
9393
from ietf.utils.text import xslugify
94+
from ietf.utils.timezone import date2datetime
9495

9596
from .forms import (InterimMeetingModelForm, InterimAnnounceForm, InterimSessionModelForm,
9697
InterimCancelForm, InterimSessionInlineFormSet, FileUploadForm, RequestMinutesForm,)
@@ -1126,7 +1127,8 @@ def week_view(request, num=None, name=None, owner=None):
11261127
filtered_assignments = schedule.assignments.exclude(timeslot__type__in=['lead','offagenda'])
11271128
# Only show assignments from the traditional meeting "week" (Sat-Fri).
11281129
# We'll determine this using the saturday before the first scheduled regular session.
1129-
first_regular_session_time = meeting.schedule.qs_assignments_with_sessions.filter(session__type_id='regular').order_by('timeslot__time').first().timeslot.time
1130+
first_regular_session = meeting.schedule.qs_assignments_with_sessions.filter(session__type_id='regular').order_by('timeslot__time').first()
1131+
first_regular_session_time = first_regular_session.timeslot.time if first_regular_session else date2datetime(meeting.date)
11301132
saturday_before = first_regular_session_time - datetime.timedelta(days=(first_regular_session_time.weekday() - 5)%7)
11311133
# saturday_after = saturday_before + datetime.timedelta(days=7)
11321134
# filtered_assignments = filtered_assignments.filter(timeslot__time__gte=saturday_before,timeslot__time__lt=saturday_after)

0 commit comments

Comments
 (0)