openstack/deb-horizon
Code Issues Proposed changes

Merge "Fix various issues with compressed angular templates and plugins"

Browse Source
This commit is contained in:
Jenkins 2016-08-29 12:17:35 +00:00 committed by Gerrit Code Review
commit baae8712f8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
horizon/templatetags/angular.py
View File

@ -33,7 +33,6 @@ def update_angular_template_hash(sender, **kwargs):
clients.
"""
context = kwargs['context'] # context the compressor is working with
theme = context['THEME'] # current theme being compressed
compressed = context['compressed'] # the compressed content
compressed_name = compressed['name'] # name of the compressed content
if compressed_name == 'angular_template_cache_preloads':
@ -43,6 +42,7 @@ def update_angular_template_hash(sender, **kwargs):
# generate the same key as used in _scripts.html when caching the
# preloads
theme = context['THEME'] # current theme being compressed
key = make_template_fragment_key(
"angular",
['template_cache_preloads', theme]
@ -115,6 +115,9 @@ def angular_templates(context):
# there will simply be no pre-loaded version for this template.
pass
templates = [(key, value) for key, value in angular_templates.items()]
templates.sort(key=lambda item: item[0])
return {
'angular_templates': angular_templates
'angular_templates': templates
}

2
openstack_dashboard/templates/angular/angular_templates.html
View File

@ -1,4 +1,4 @@
{% for static_path, template_html in angular_templates.items %}
{% for static_path, template_html in angular_templates %}
<script type='text/javascript' id='{{ static_path }}'>
{% include 'angular/angular_templates.js' %}
</script>