From 5bb3a956995842cbfdab8a0b24627d0facd05f72 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mair@oewf.org>
Date: Thu, 11 Nov 2021 23:04:16 +0100
Subject: [PATCH] Fix theme selector Fixes #2298

---
 .../part/templatetags/inventree_extras.py     | 21 ++++++++++++-------
 .../InvenTree/settings/user_display.html      |  3 ++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index 590ea20a6f..dd98eb8c65 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -292,6 +292,19 @@ def progress_bar(val, max, *args, **kwargs):
 
 @register.simple_tag()
 def get_color_theme_css(username):
+    user_theme_name = get_user_color_theme(username)
+    # Build path to CSS sheet
+    inventree_css_sheet = os.path.join('css', 'color-themes', user_theme_name + '.css')
+
+    # Build static URL
+    inventree_css_static_url = os.path.join(settings.STATIC_URL, inventree_css_sheet)
+
+    return inventree_css_static_url
+
+
+@register.simple_tag()
+def get_user_color_theme(username):
+    """ Get current user color theme """
     try:
         user_theme = ColorTheme.objects.filter(user=username).get()
         user_theme_name = user_theme.name
@@ -300,13 +313,7 @@ def get_color_theme_css(username):
     except ColorTheme.DoesNotExist:
         user_theme_name = 'default'
 
-    # Build path to CSS sheet
-    inventree_css_sheet = os.path.join('css', 'color-themes', user_theme_name + '.css')
-
-    # Build static URL
-    inventree_css_static_url = os.path.join(settings.STATIC_URL, inventree_css_sheet)
-
-    return inventree_css_static_url
+    return user_theme_name
 
 
 @register.simple_tag()
diff --git a/InvenTree/templates/InvenTree/settings/user_display.html b/InvenTree/templates/InvenTree/settings/user_display.html
index 0fab3233ac..ae7843df9c 100644
--- a/InvenTree/templates/InvenTree/settings/user_display.html
+++ b/InvenTree/templates/InvenTree/settings/user_display.html
@@ -37,8 +37,9 @@
             <div class='form-group input-group mb-3'>
                 <select id='theme' name='theme' class='select form-control'>
                     {% get_available_themes as themes %}
+                    {% get_user_color_theme request.user.username as user_theme %}
                     {% for theme in themes %}
-                    <option value='{{ theme.key }}'>{{ theme.name }}</option>
+                    <option value='{{ theme.key }}'{% if theme.key == user_theme %} selected{% endif%}>{{ theme.name }}</option>
                     {% endfor %}
                 </select>
                 <div class='input-group-append'>