Skip to content

Commit d783790

Browse files
committed
Merged in [17484] from valery@smyslov.net:
When requesting a new WG session, and retrieving information about the previous session, look back to the previous time the group met, instead of simply checking the previous IETF meeting and maybe not finding any information to retrieve. - Legacy-Id: 17504 Note: SVN reference [17484] has been migrated to Git commit 88f1166
2 parents 19fcb37 + 88f1166 commit d783790

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

ietf/secr/sreq/views.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,17 @@ def new(request, acronym):
594594
# the "previous" querystring causes the form to be returned
595595
# pre-populated with data from last meeeting's session request
596596
elif request.method == 'GET' and 'previous' in request.GET:
597-
previous_meeting = Meeting.objects.get(number=str(int(meeting.number) - 1))
598-
previous_sessions = add_event_info_to_session_qs(Session.objects.filter(meeting=previous_meeting, group=group)).exclude(current_status__in=['notmeet', 'deleted']).order_by('id')
599-
if not previous_sessions:
600-
messages.warning(request, 'This group did not meet at %s' % previous_meeting)
597+
latest_session = add_event_info_to_session_qs(Session.objects.filter(meeting__type_id='ietf', group=group)).exclude(current_status__in=['notmeet', 'deleted', 'canceled',]).order_by('-meeting__date').first()
598+
if latest_session:
599+
previous_meeting = Meeting.objects.get(number=latest_session.meeting.number)
600+
previous_sessions = add_event_info_to_session_qs(Session.objects.filter(meeting=previous_meeting, group=group)).exclude(current_status__in=['notmeet', 'deleted']).order_by('id')
601+
if not previous_sessions:
602+
messages.warning(request, 'This group did not meet at %s' % previous_meeting)
603+
return redirect('ietf.secr.sreq.views.new', acronym=acronym)
604+
else:
605+
messages.info(request, 'Fetched session info from %s' % previous_meeting)
606+
else:
607+
messages.warning(request, 'Did not find any previous meeting')
601608
return redirect('ietf.secr.sreq.views.new', acronym=acronym)
602609

603610
initial = get_initial_session(previous_sessions, prune_conflicts=True)

0 commit comments

Comments
 (0)