From 63664714cae73b5aaf81049b55c54276e86e1983 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Aug 2022 10:38:36 +1000 Subject: [PATCH] Return early if themes dir does not exist (#3453) * Return early if themes dir does not exist (cherry picked from commit 3e1cdcdb079fd2614d4a6478dc0addea94537d6f) * Bump version number to 0.8.1 --- InvenTree/InvenTree/version.py | 2 +- InvenTree/common/models.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/InvenTree/InvenTree/version.py b/InvenTree/InvenTree/version.py index e05f440d39..36eb120d17 100644 --- a/InvenTree/InvenTree/version.py +++ b/InvenTree/InvenTree/version.py @@ -13,7 +13,7 @@ import common.models from InvenTree.api_version import INVENTREE_API_VERSION # InvenTree software version -INVENTREE_SW_VERSION = "0.8.0" +INVENTREE_SW_VERSION = "0.8.1" def inventreeInstanceName(): diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index b804123c69..88fa405b1e 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -1775,12 +1775,13 @@ class ColorTheme(models.Model): @classmethod def get_color_themes_choices(cls): """Get all color themes from static folder.""" - if settings.TESTING and not os.path.exists(settings.STATIC_COLOR_THEMES_DIR): + if not os.path.exists(settings.STATIC_COLOR_THEMES_DIR): logger.error('Theme directory does not exsist') return [] # Get files list from css/color-themes/ folder files_list = [] + for file in os.listdir(settings.STATIC_COLOR_THEMES_DIR): files_list.append(os.path.splitext(file))