openstack
/
charm-openstack-dashboard
Code Issues Proposed changes

Adding default theme on AVAILABLE_THEME even if custom is enabled. 

In case custom theme imports default theme's scss file, upgrading
openstack-dashboard pkg causes compression error. By adding default
theme to AVAILABLE_THEME list, collectstatic collects proper default
theme files to /var/lib/openstack-dashboard/static/ and custom theme
can import proper files.

Importing default theme's files seems to be normal when someone wants
to modify default theme a little not creating whole theme.

Closes-Bug: #1812148

Change-Id: Ic1aa03387814a57dde876aa6d95e64b555152b7c
This commit is contained in:
Seyeong Kim 2019-01-24 11:48:21 +09:00
parent 903cbfdb2f
commit 1534accb10
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/newton/local_settings.py
View File

@ -906,7 +906,10 @@ try:
from custom_theme import *
except ImportError:
pass
AVAILABLE_THEMES += [ ('custom', 'custom', 'themes/custom') ]
AVAILABLE_THEMES += [
('default', 'Default', 'themes/default'),
('custom', 'custom', 'themes/custom')
]
{% endif %}
WEBROOT = '{{ webroot }}'

5
templates/ocata/local_settings.py
View File

@ -908,7 +908,10 @@ try:
from custom_theme import *
except ImportError:
pass
AVAILABLE_THEMES += [ ('custom', 'custom', 'themes/custom') ]
AVAILABLE_THEMES += [
('default', 'Default', 'themes/default'),
('custom', 'custom', 'themes/custom')
]
{% endif %}
WEBROOT = '{{ webroot }}'