From 302cfccb99c7d5934f5ae43e278f663156b242db Mon Sep 17 00:00:00 2001 From: Sam Betts Date: Wed, 1 Oct 2014 12:09:27 +0100 Subject: [PATCH] Sort networks and projects by name instead of UUID Change-Id: I73b9f05303917300121ed99042cdd5004184261b Closes-Bug: 1375206 --- .../dashboards/project/instances/workflows/create_instance.py | 1 + openstack_dashboard/templatetags/context_selection.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py index 8931091710..9a74ee85fe 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py +++ b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py @@ -677,6 +677,7 @@ class SetNetworkAction(workflows.Action): for n in networks: n.set_id_as_name_if_empty() network_list.append((n.id, n.name)) + sorted(network_list, key=lambda obj: obj[1]) except Exception: exceptions.handle(request, _('Unable to retrieve networks.')) diff --git a/openstack_dashboard/templatetags/context_selection.py b/openstack_dashboard/templatetags/context_selection.py index ebc3aeca9a..617eced79e 100644 --- a/openstack_dashboard/templatetags/context_selection.py +++ b/openstack_dashboard/templatetags/context_selection.py @@ -66,7 +66,8 @@ def show_project_list(context): if 'request' not in context: return {} request = context['request'] - context = {'projects': sorted(context['authorized_tenants']), + context = {'projects': sorted(context['authorized_tenants'], + key=lambda project: project.name), 'project_id': request.user.project_id, 'request': request} return context