From 1534accb10360d1a9792415577d60760fe7ee134 Mon Sep 17 00:00:00 2001 From: Seyeong Kim Date: Thu, 24 Jan 2019 11:48:21 +0900 Subject: [PATCH] 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 --- templates/newton/local_settings.py | 5 ++++- templates/ocata/local_settings.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/newton/local_settings.py b/templates/newton/local_settings.py index 11ae4928..8b33170a 100644 --- a/templates/newton/local_settings.py +++ b/templates/newton/local_settings.py @@ -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 }}' diff --git a/templates/ocata/local_settings.py b/templates/ocata/local_settings.py index 8b35d30f..5b445325 100644 --- a/templates/ocata/local_settings.py +++ b/templates/ocata/local_settings.py @@ -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 }}'