File 0001-Fix-strip-when-discovering-theme-templates... of Package openstack-dashboard

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-strip-when-discovering-theme-templates.patch of Package openstack-dashboard (Revision 034993c3e09e3017a59f6da906b50631)

Currently displaying revision 034993c3e09e3017a59f6da906b50631 , Show latest

From 2ef7e344ee020c81703766546f136f038ba523e4 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Mon, 10 Jul 2017 08:24:09 +0200
Subject: [PATCH] Fix strip() when discovering theme templates

When using a custom template which eg. overrides the 500.html template
via openstack_dashboard/themes/templ-name/templates/500.html, the
function file_discovery.populate_horizon_config() populates the
variable 'external_templates' to ['templates/500.html']. In that case,
the split does not work and fails with:

(templates_part, override_path) = theme_file.split('/templates/')
ValueError: need more than 1 value to unpack

because 'external_templates' does not start with a '/'.

Closes-Bug: #1703296
Change-Id: Iaf8f7ef8e9362f5c7e72909477dde36a05401968
---
 openstack_dashboard/utils/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: horizon-12.0.0.0rc3.dev3/openstack_dashboard/utils/settings.py
===================================================================
--- horizon-12.0.0.0rc3.dev3.orig/openstack_dashboard/utils/settings.py
+++ horizon-12.0.0.0rc3.dev3/openstack_dashboard/utils/settings.py
@@ -318,7 +318,7 @@ def find_static_files(
         theme_name = url.split('/')[-1]
 
         # build a dictionary of this theme's static HTML templates.
-        # For each overridden template, strip off the '/templates/' part of the
+        # For each overridden template, strip off the 'templates/' part of the
         # theme filename then use that name as the key, and the location in the
         # theme directory as the value. This allows the quick lookup of
         # theme path for any file overridden by a theme template
@@ -329,7 +329,7 @@ def find_static_files(
             #       'framework/widgets/help-panel/help-panel.html'
             #   ] = 'themes/material/templates/framework/widgets/\
             #        help-panel/help-panel.html'
-            (templates_part, override_path) = theme_file.split('/templates/')
+            (templates_part, override_path) = theme_file.split('templates/')
             template_overrides[override_path] = 'themes/' + \
                                                 theme_name + theme_file

Places

File 0001-Fix-strip-when-discovering-theme-templates.patch of Package openstack-dashboard (Revision 034993c3e09e3017a59f6da906b50631)

Places