summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Betts <sam@code-smash.net>2014-10-01 12:09:27 +0100
committerSam Betts <sam@code-smash.net>2014-10-01 12:28:03 +0100
commit302cfccb99c7d5934f5ae43e278f663156b242db (patch)
tree06698fa0448beec8b3fa9ba57c392bd5beaaa860
parent35487bf8a00ae8c0c445637443c7ee951a29fb10 (diff)
downloadhorizon-302cfccb99c7d5934f5ae43e278f663156b242db.tar.gz
Sort networks and projects by name instead of UUID
Change-Id: I73b9f05303917300121ed99042cdd5004184261b Closes-Bug: 1375206
-rw-r--r--openstack_dashboard/dashboards/project/instances/workflows/create_instance.py1
-rw-r--r--openstack_dashboard/templatetags/context_selection.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py
index 893109171..9a74ee85f 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 ebc3aeca9..617eced79 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