← Back to branch summary

~ubuntu-branches/ubuntu/vivid/horizon/vivid-proposed

« back to all changes in this revision

Viewing changes to openstack_dashboard/templatetags/context_selection.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Chuck Short, Corey Bryant, James Page
  • Date: 2015-01-05 16:42:06 UTC
  • mfrom: (0.9.1) (1.2.5)
  • Revision ID: package-import@ubuntu.com-20150105164206-zrt2q64h4weugkur
Tags: 1:2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open for Kilo.
* d/control: Update bzr branches 
* d/patches/embedded-xstatic.patch: Refreshed
* d/patches/add-juju-environment-download.patch: Temporarily disabled.

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
* d/control: Bumped Standards-Version to 3.9.6.

[ James Page ]
* d/bundle-xstatic.sh: Tweak grep to be case insensitive.
* d/p/add-juju-environment-download.patch: Rebase for kilo-1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/templatetags/context_selection.py
37
37
        return {}
38
38
    request = context['request']
39
39
    context = {'domain_supported': is_multidomain_supported(),
40
 
               'domain_name': request.user.user_domain_id,
 
40
               'domain_name': request.user.user_domain_name,
41
41
               'project_name': request.user.project_name,
42
42
               'multi_region':
43
 
                    len(request.user.available_services_regions) > 1,
 
43
               len(request.user.available_services_regions) > 1,
44
44
               'region_name': request.user.services_region,
45
45
               'request': request}
46
46
 
55
55
        return {}
56
56
    request = context['request']
57
57
    context = {'domain_supported': is_multidomain_supported(),
58
 
               'domain_name': request.user.user_domain_id,
 
58
               'domain_name': request.user.user_domain_name,
59
59
               'request': request}
60
60
    return context
61
61
 
63
63
@register.inclusion_tag('context_selection/_project_list.html',
64
64
                        takes_context=True)
65
65
def show_project_list(context):
 
66
    max_proj = getattr(settings,
 
67
                       'DROPDOWN_MAX_ITEMS',
 
68
                       30)
66
69
    if 'request' not in context:
67
70
        return {}
68
71
    request = context['request']
69
72
    context = {'projects': sorted(context['authorized_tenants'],
70
 
                    key=lambda project: project.name),
 
73
                                  key=lambda project: project.name)[:max_proj],
71
74
               'project_id': request.user.project_id,
72
75
               'request': request}
73
76
    return context
80
83
        return {}
81
84
    request = context['request']
82
85
    context = {'multi_region':
83
 
                    len(request.user.available_services_regions) > 1,
 
86
               len(request.user.available_services_regions) > 1,
84
87
               'region_name': request.user.services_region,
85
88
               'regions': sorted(request.user.available_services_regions),
86
89
               'request': request}