From cc6096e190d50f8c8f96ed7f5654a1a7d4dab5a7 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 21 Jun 2016 12:59:10 +0000 Subject: [PATCH] Merged in [11435] from rcross@amsl.com: Fix a few things with interim materials management. - Legacy-Id: 11438 Note: SVN reference [11435] has been migrated to Git commit f1bb818434c83b4180e9655d062825a5c0016ef8 --- ietf/secr/proceedings/views.py | 6 +++--- ietf/secr/templates/proceedings/main.html | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index 5269feb24..7e8f184b8 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -397,10 +397,10 @@ def main(request): meetings = Meeting.objects.filter(type='ietf',date__gt=datetime.datetime.today() - datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS)).order_by('number') groups = get_my_groups(request.user) - interim_meetings = Meeting.objects.filter(type='interim',session__group__in=groups).order_by('-date') + interim_meetings = Meeting.objects.filter(type='interim',session__group__in=groups,session__status='sched').order_by('-date') # tac on group for use in templates for m in interim_meetings: - m.group = m.session_set.all()[0].group + m.group = m.session_set.first().group # we today's date to see if we're past the submissio cutoff today = datetime.date.today() @@ -720,7 +720,7 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None): ''' def redirection_back(meeting, group): if meeting.type.slug == 'interim': - url = reverse('proceedings_interim', kwargs={'acronym':group.acronym}) + url = reverse('proceedings') else: url = reverse('proceedings_select', kwargs={'meeting_num':meeting.number}) return HttpResponseRedirect(url) diff --git a/ietf/secr/templates/proceedings/main.html b/ietf/secr/templates/proceedings/main.html index d10a0086e..88d2064e8 100644 --- a/ietf/secr/templates/proceedings/main.html +++ b/ietf/secr/templates/proceedings/main.html @@ -53,7 +53,8 @@ {% for meeting in interim_meetings %} - {{ meeting.group.acronym|ljust:"8" }} - {{ meeting.date }} + {{ meeting.group.acronym }} + {{ meeting.date }} {% endfor %}