diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-02 09:47:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-02 09:47:41 +0000 |
| commit | d9047bed3f1fa777de6d824c7525441ff90ba68b (patch) | |
| tree | 0f04f62de77d681796291da71ca016e39d615484 | |
| parent | fc3709e2ff163aeb2ad6f2ccaf11b6b0949bf88b (diff) | |
| parent | 302cfccb99c7d5934f5ae43e278f663156b242db (diff) | |
| download | horizon-d9047bed3f1fa777de6d824c7525441ff90ba68b.tar.gz | |
Merge "Sort networks and projects by name instead of UUID"
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/workflows/create_instance.py | 1 | ||||
| -rw-r--r-- | openstack_dashboard/templatetags/context_selection.py | 3 |
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 |