From 679dc72e218a777327a96aa1cddb0cbd747525e9 Mon Sep 17 00:00:00 2001
From: Gwendolyn <me@gwendolyn.dev>
Date: Fri, 29 Mar 2024 15:06:51 +0100
Subject: [PATCH] theme settings fixes

---
 src/c3nav/editor/forms.py |  2 +-
 src/c3nav/settings.py     |  4 ++--
 src/c3nav/site/themes.py  | 22 ++++++++++------------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/c3nav/editor/forms.py b/src/c3nav/editor/forms.py
index 727b789e..ba65579c 100644
--- a/src/c3nav/editor/forms.py
+++ b/src/c3nav/editor/forms.py
@@ -418,7 +418,7 @@ def create_editor_form(editor_model):
                        'label_settings', 'label_override', 'min_zoom', 'max_zoom', 'font_size',
                        'allow_levels', 'allow_spaces', 'allow_areas', 'allow_pois', 'allow_dynamic_locations',
                        'left', 'top', 'right', 'bottom', 'import_tag', 'import_block_data', 'import_block_geom',
-                       'public', 'high_contrast', 'funky', 'randomize_primary_color', 'color_logo',
+                       'public', 'default', 'dark', 'high_contrast', 'funky', 'randomize_primary_color', 'color_logo',
                        'color_css_initial', 'color_css_primary', 'color_css_secondary', 'color_css_tertiary',
                        'color_css_quaternary', 'color_css_quinary', 'color_css_header_background',
                        'color_css_header_text', 'color_css_header_text_hover',
diff --git a/src/c3nav/settings.py b/src/c3nav/settings.py
index eac0ce07..3542dda0 100644
--- a/src/c3nav/settings.py
+++ b/src/c3nav/settings.py
@@ -560,8 +560,8 @@ RANDOM_PRIMARY_COLOR_LIST = [hex_from_oklch(PRIMARY_COLOR_RANDOMISATION['lightne
                                             x) for x in range(0, 360)]
 
 BASE_THEME = {
-    'is_dark': config.get('theme', 'is_dark', fallback=False),
-    'randomize_primary_color': config.get('theme', 'randomize_primary_color', fallback=False),
+    'is_dark': config.getboolean('theme', 'is_dark', fallback=False),
+    'randomize_primary_color': config.getboolean('theme', 'randomize_primary_color', fallback=False),
     'map': {
         'background': config.get('theme', 'map_background', fallback='#dcdcdc'),
         'wall_fill': config.get('theme', 'map_wall_fill', fallback='#aaaaaa'),
diff --git a/src/c3nav/site/themes.py b/src/c3nav/site/themes.py
index 2f4948c0..01541493 100644
--- a/src/c3nav/site/themes.py
+++ b/src/c3nav/site/themes.py
@@ -81,18 +81,16 @@ def make_themes(theme_models):
             'primary_color': primary_color,
         }
         if theme.default:
+            default_theme = {
+                    'css_code': css_code,
+                    'theme_color': css_vars['header-background'],
+                    'randomize_primary_color': theme.randomize_primary_color,
+                    'primary_color': primary_color,
+                }
             if theme.dark:
-                default_dark = {
-                    'css_code': css_code,
-                    'theme_color': css_vars['header-background'],
-                    'primary_color': primary_color,
-                }
+                default_dark = default_theme
             else:
-                default_light = {
-                    'css_code': css_code,
-                    'theme_color': css_vars['header-background'],
-                    'primary_color': primary_color,
-                }
+                default_light = default_theme
 
     if default_dark is not None and default_light is not None:
         name = _('Automatic')
@@ -118,13 +116,13 @@ def make_themes(theme_models):
     return themes
 
 
-@mapdata_cache
+# @mapdata_cache
 def css_themes_all():
     from c3nav.mapdata.models.theme import Theme
     return make_themes(Theme.objects.all())
 
 
-@mapdata_cache
+# @mapdata_cache
 def css_themes_public():
     from c3nav.mapdata.models.theme import Theme
     return make_themes(Theme.objects.filter(public=True))