From 0922c6c9841994fc332e4ffc7b6f0610bde03114 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 10 Feb 2017 22:02:29 +0000 Subject: [PATCH] Added ordering by name to group personnel lists in edit and about views. This ordering is by the person's profile name, without attempting to determine which name part is family name or given name. Fixes #2184. - Legacy-Id: 12817 --- ietf/group/views.py | 2 +- ietf/group/views_edit.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/group/views.py b/ietf/group/views.py index e85169e07..4b4ec20d0 100644 --- a/ietf/group/views.py +++ b/ietf/group/views.py @@ -79,7 +79,7 @@ def fill_in_charter_info(group, include_drafts=False): group.areadirector = getattr(group.ad_role(),'email',None) personnel = {} - for r in Role.objects.filter(group=group).select_related("email", "person", "name"): + for r in Role.objects.filter(group=group).order_by('person__name').select_related("email", "person", "name"): if r.name_id not in personnel: personnel[r.name_id] = [] personnel[r.name_id].append(r) diff --git a/ietf/group/views_edit.py b/ietf/group/views_edit.py index 82760115b..b49dacf4e 100644 --- a/ietf/group/views_edit.py +++ b/ietf/group/views_edit.py @@ -380,7 +380,7 @@ def edit(request, group_type=None, acronym=None, action="edit"): ) for slug in roles_for_group_type(group_type): - init[slug + "_roles"] = Email.objects.filter(role__group=group, role__name=slug) + init[slug + "_roles"] = Email.objects.filter(role__group=group, role__name=slug).order_by('role__person__name') else: init = dict(ad=request.user.person.id if group_type == "wg" and has_role(request.user, "Area Director") else None, )