openstack
/
charm-openstack-dashboard
Code Issues Proposed changes

Extend AVAILABLE_THEMES when setting DEFAULT_THEME 

DEFAULT_THEME has no effect if the referenced theme is not listed
in AVAILABLE_THEMES.

Change-Id: I98f5a9bd789a584db786dbb7e34a48b26ff258fa
Closes-Bug: 1626599
This commit is contained in:
Frode Nordahl 2016-11-22 10:04:40 +01:00
parent 4834c461aa
commit 5eec7b6648
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
templates/mitaka/local_settings.py
View File

@ -831,6 +831,19 @@ try:
except ImportError:
pass
{% elif default_theme %}
try:
AVAILABLE_THEMES
except NameError:
try:
from openstack_dashboard.settings import AVAILABLE_THEMES
except ImportError:
AVAILABLE_THEMES = []
pass
if '{{ default_theme }}' not in [el[0] for el in AVAILABLE_THEMES]:
AVAILABLE_THEMES += [
('{{ default_theme }}', '{{ default_theme }}',
'themes/{{ default_theme }}'),
]
DEFAULT_THEME = '{{ default_theme }}'
{% endif %}

13
templates/newton/local_settings.py
View File

@ -868,6 +868,19 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES',
# Enable the Ubuntu theme if it is present.
DEFAULT_THEME = 'ubuntu'
{% elif default_theme %}
try:
AVAILABLE_THEMES
except NameError:
try:
from openstack_dashboard.settings import AVAILABLE_THEMES
except ImportError:
AVAILABLE_THEMES = []
pass
if '{{ default_theme }}' not in [el[0] for el in AVAILABLE_THEMES]:
AVAILABLE_THEMES += [
('{{ default_theme }}', '{{ default_theme }}',
'themes/{{ default_theme }}'),
]
DEFAULT_THEME = '{{ default_theme }}'
{% endif %}