From c5e0814e116074998871c395ab7f12ee8583ec6c Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 5 Jun 2016 09:49:24 +0000 Subject: [PATCH] Made the photo url and view function names more generic. Shortened a tab name. - Legacy-Id: 11272 --- ietf/group/urls_info.py | 2 +- ietf/group/views.py | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ietf/group/urls_info.py b/ietf/group/urls_info.py index daeadcf88..3cc663507 100644 --- a/ietf/group/urls_info.py +++ b/ietf/group/urls_info.py @@ -19,6 +19,6 @@ urlpatterns = patterns('', (r'^bofs/$', views.bofs), (r'^email-aliases/$', 'ietf.group.views.email_aliases'), (r'^bofs/create/$', views_edit.edit, {'action': "create"}, "bof_create"), - (r'^chair-photos/$', views.chair_photos), + (r'^photos/$', views.photos), (r'^(?P[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')), ) diff --git a/ietf/group/views.py b/ietf/group/views.py index f38ace549..25a9585d1 100644 --- a/ietf/group/views.py +++ b/ietf/group/views.py @@ -358,7 +358,7 @@ def construct_group_menu_context(request, group, selected, group_type, others): if group.features.has_documents: kwargs["output_type"] = "svg" - entries.append((mark_safe("Dependency graph »"), urlreverse("ietf.group.views.dependencies", kwargs=kwargs))) + entries.append((mark_safe("Dependencies »"), urlreverse("ietf.group.views.dependencies", kwargs=kwargs))) del kwargs["output_type"] if group.has_tools_page(): @@ -871,11 +871,9 @@ def derived_archives(request, acronym=None, group_type=None): 'list_acronym':list_acronym, })) -def chair_photos(request, group_type=None): - if not group_type=='wg': - raise Http404 - chair_roles = sorted(Role.objects.filter(group__type='wg',group__state='active',name_id='chair'),key=lambda x: x.person.last_name()+x.person.name+x.group.acronym) - for role in chair_roles: +def photos(request, group_type=None): + roles = sorted(Role.objects.filter(group__type=group_type, group__state='active', name_id='chair'),key=lambda x: x.person.last_name()+x.person.name+x.group.acronym) + for role in roles: role.last_initial = role.person.last_name()[0] - return render(request, 'group/chair_photos.html', {'chair_roles':chair_roles}) + return render(request, 'group/photos.html', {'group_type': group_type, 'role': 'Chair', 'roles': roles })