Skip to content

Commit c5e0814

Browse files
committed
Made the photo url and view function names more generic. Shortened a tab name.
- Legacy-Id: 11272
1 parent f9136dc commit c5e0814

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

ietf/group/urls_info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
(r'^bofs/$', views.bofs),
2020
(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
2121
(r'^bofs/create/$', views_edit.edit, {'action': "create"}, "bof_create"),
22-
(r'^chair-photos/$', views.chair_photos),
22+
(r'^photos/$', views.photos),
2323
(r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
2424
)

ietf/group/views.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ def construct_group_menu_context(request, group, selected, group_type, others):
358358

359359
if group.features.has_documents:
360360
kwargs["output_type"] = "svg"
361-
entries.append((mark_safe("Dependency graph &raquo;"), urlreverse("ietf.group.views.dependencies", kwargs=kwargs)))
361+
entries.append((mark_safe("Dependencies &raquo;"), urlreverse("ietf.group.views.dependencies", kwargs=kwargs)))
362362
del kwargs["output_type"]
363363

364364
if group.has_tools_page():
@@ -871,11 +871,9 @@ def derived_archives(request, acronym=None, group_type=None):
871871
'list_acronym':list_acronym,
872872
}))
873873

874-
def chair_photos(request, group_type=None):
875-
if not group_type=='wg':
876-
raise Http404
877-
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)
878-
for role in chair_roles:
874+
def photos(request, group_type=None):
875+
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)
876+
for role in roles:
879877
role.last_initial = role.person.last_name()[0]
880-
return render(request, 'group/chair_photos.html', {'chair_roles':chair_roles})
878+
return render(request, 'group/photos.html', {'group_type': group_type, 'role': 'Chair', 'roles': roles })
881879

0 commit comments

Comments
 (0)