x/tuskar-ui
Code Issues Proposed changes

Fixed template loader bug. Fixes bug 999360.

Browse Source 
Change-Id: I96902b5ec810a64f3377b263ab044b3be0eb1c85
This commit is contained in:
Gabriel Hurley 2012-05-13 15:42:01 -07:00
parent cb48cebefc
commit 155a3a1d38
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
horizon/loaders.py
View File

@ -17,18 +17,20 @@ class TemplateLoader(BaseLoader):
is_usable = True is_usable = True
def get_template_sources(self, template_name): def get_template_sources(self, template_name):
dash_name, panel_name, remainder = template_name.split(os.path.sep, 2) bits = template_name.split(os.path.sep, 2)
key = os.path.join(dash_name, panel_name) if len(bits) == 3:
if key in panel_template_dirs: dash_name, panel_name, remainder = bits
template_dir = panel_template_dirs[key] key = os.path.join(dash_name, panel_name)
try: if key in panel_template_dirs:
yield safe_join(template_dir, panel_name, remainder) template_dir = panel_template_dirs[key]
except UnicodeDecodeError: try:
# The template dir name wasn't valid UTF-8. yield safe_join(template_dir, panel_name, remainder)
raise except UnicodeDecodeError:
except ValueError: # The template dir name wasn't valid UTF-8.
# The joined path was located outside of template_dir. raise
pass except ValueError:
# The joined path was located outside of template_dir.
pass
def load_template_source(self, template_name, template_dirs=None): def load_template_source(self, template_name, template_dirs=None):
for path in self.get_template_sources(template_name): for path in self.get_template_sources(template_name):