← Back to branch summary

~ubuntu-branches/ubuntu/utopic/horizon/utopic-updates

« back to all changes in this revision

Viewing changes to openstack_dashboard/templatetags/context_selection.py

  • Committer: Package Import Robot
  • Author(s): James Page, Chris Johnston, James Page
  • Date: 2014-10-03 17:54:18 UTC
  • mfrom: (0.4.1) (1.1.44) (70.1.2 utopic)
  • Revision ID: package-import@ubuntu.com-20141003175418-1jomx0azdvnl5fxz
Tags: 1:2014.2~rc1-0ubuntu1
https://launchpad.net/bugs/1308651
[ Chris Johnston ]
* d/theme/css/ubuntu.css: Fix Ubuntu theme for Instances "more" dropdown
  (LP: #1308651).

[ James Page ]
* New upstream release candidate:
  - d/p/*: Refresh.
* d/watch: Use tarballs.openstack.org for upstream releases. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/templatetags/context_selection.py
66
66
    if 'request' not in context:
67
67
        return {}
68
68
    request = context['request']
69
 
    context = {'projects': context['authorized_tenants'],
 
69
    context = {'projects': sorted(context['authorized_tenants'],
 
70
                    key=lambda project: project.name),
70
71
               'project_id': request.user.project_id,
71
72
               'request': request}
72
73
    return context
81
82
    context = {'multi_region':
82
83
                    len(request.user.available_services_regions) > 1,
83
84
               'region_name': request.user.services_region,
84
 
               'regions': request.user.available_services_regions,
 
85
               'regions': sorted(request.user.available_services_regions),
85
86
               'request': request}
86
87
    return context