From bea74cb8b48115bc6713260db98978623e38fbdd Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 23 Jun 2016 15:08:39 +0000 Subject: [PATCH] Added an optional parameter 'owner' to meeting.views.agenda(). Fixed issues #1959 and #1615 - Legacy-Id: 11463 --- ietf/meeting/views.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index e7ca76fb9..cd7754e6b 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -393,7 +393,7 @@ def list_agendas(request, num=None ): }) @ensure_csrf_cookie -def agenda(request, num=None, name=None, base=None, ext=None): +def agenda(request, num=None, name=None, base=None, ext=None, owner=None): base = base if base else 'agenda' ext = ext if ext else '.html' mimetype = { @@ -414,7 +414,12 @@ def agenda(request, num=None, name=None, base=None, ext=None): else: raise Http404 - schedule = get_schedule(meeting, name) + if name is None: + schedule = get_schedule(meeting, name) + else: + person = get_person_by_email(owner) + schedule = get_schedule_by_name(meeting, person, name) + if schedule == None: base = base.replace("-utc", "") return render(request, "meeting/no-"+base+ext, {'meeting':meeting }, content_type=mimetype[ext])