removed dark_model config in admin form, some kind of value change in config causes dark mode to enable even when disabled in config file

Author: Thomas Hanke

ckanext/matolabtheme/plugin.py

@@ -5,6 +5,10 @@
 from ckan.lib.plugins import DefaultTranslation
 
 
+log = __import__("logging").getLogger(__name__)
+
+
+
 class MatolabthemePlugin(plugins.SingletonPlugin, DefaultTranslation):
     plugins.implements(plugins.IConfigurer)
     plugins.implements(plugins.IConfigDeclaration)
@@ -21,18 +25,49 @@ def update_config(self, config_):
         toolkit.add_public_directory(config_, "public")
         toolkit.add_resource("assets", "matolabtheme")
 
+    # IConfigDeclaration
+
+    def declare_config_options(self, declaration: Declaration, key: Key):
+
+        declaration.annotate("matolabtheme")
+        group = key.ckanext.matolabtheme
+        declaration.declare(group.contact_url, "https://github.com/Mat-O-Lab")
+        declaration.declare(
+            group.legal_person_md, "legal person name, street number, Zip city, country"
+        )
+        declaration.declare(
+            group.contact_dp_commissioner_email_md,
+            "[[email protected]](mailto:[email protected]?subject=dataprotection CKAN)",
+        )
+        declaration.declare(
+            group.dsvgo_contact_md,
+            "legal person name, street number, Zip city, country",
+        )
+        option=declaration.declare_bool(group.dark_mode, False)
+        option.set_validators("not_missing boolean_validator")
+        declaration.declare(group.banner_top, "/static/banner_top.png")
+        declaration.declare(group.banner_top_upload, "")
+        declaration.declare(group.clear_banner_top_upload, "")
+        declaration.declare(group.banner_bottom, "/static/banner_bottom.png")
+        declaration.declare(group.banner_bottom_upload, "")
+        declaration.declare(group.clear_banner_bottom_upload, "")
+        declaration.declare(group.attribution_logo, "/static/favicon.png")
+        declaration.declare(group.attribution_logo_upload, "")
+        declaration.declare(group.clear_attribution_logo_upload, "")
+
     def update_config_schema(self, schema):
 
         ignore_missing = toolkit.get_validator("ignore_missing")
+        bool_val = toolkit.get_validator("boolean_validator")
         unicode_safe = toolkit.get_validator("unicode_safe")
-
+        dark_mode=toolkit.config.get("ckanext.matolabtheme.dark_mode")
         schema.update(
             {
                 # This is an existing CKAN core configuration option, we are just
                 # making it available to be editable at runtime
-                "ckanext.matolabtheme.dark_mode": [
-                    ignore_missing,
-                ],
+                # "ckanext.matolabtheme.dark_mode": [
+                #     ignore_missing, bool_val
+                # ],
                 "ckanext.matolabtheme.banner_top": [
                     ignore_missing,
                     unicode_safe,
@@ -71,38 +106,9 @@ def update_config_schema(self, schema):
                 ],
             }
         )
-
         return schema
 
-    # IConfigDeclaration
-
-    def declare_config_options(self, declaration: Declaration, key: Key):
-
-        declaration.annotate("matolabtheme")
-        group = key.ckanext.matolabtheme
-        declaration.declare(group.contact_url, "https://github.com/Mat-O-Lab")
-        declaration.declare(
-            group.legal_person_md, "legal person name, street number, Zip city, country"
-        )
-        declaration.declare(
-            group.contact_dp_commissioner_email_md,
-            "[[email protected]](mailto:[email protected]?subject=dataprotection CKAN)",
-        )
-        declaration.declare(
-            group.dsvgo_contact_md,
-            "legal person name, street number, Zip city, country",
-        )
-        declaration.declare_bool(group.dark_mode, False)
-        declaration.declare(group.banner_top, "/static/banner_top.png")
-        declaration.declare(group.banner_top_upload, "")
-        declaration.declare(group.clear_banner_top_upload, "")
-        declaration.declare(group.banner_bottom, "/static/banner_bottom.png")
-        declaration.declare(group.banner_bottom_upload, "")
-        declaration.declare(group.clear_banner_bottom_upload, "")
-        declaration.declare(group.attribution_logo, "/static/favicon.png")
-        declaration.declare(group.attribution_logo_upload, "")
-        declaration.declare(group.clear_attribution_logo_upload, "")
-
+    
     # ITemplateHelpers
 
     def get_helpers(self):

ckanext/matolabtheme/templates/matolabtheme/theme_config.html

@@ -13,7 +13,7 @@
     {% block admin_form %}
     {{ h.csrf_input() }}
       <!-- Dark Mode Toggle Switch -->
-      {{ form.checkbox('ckanext.matolabtheme.dark_mode', id='field-matolabthem-darkmode', label= _('Enable Dark Mode'), checked=((true if data['ckanext.matolabtheme.dark_mode'] else false)), error=error, classes=['control-medium']) }}
+      <!-- {{ form.checkbox('ckanext.matolabtheme.dark_mode', id='field-matolabthem-darkmode', label= _('Enable Dark Mode'), checked=((true if data['ckanext.matolabtheme.dark_mode'] else false)), error=error, classes=['control-medium']) }} -->
 
       {% set field1_url = 'ckanext.matolabtheme.banner_top' %}
       {% set is_upload = data[field1_url] and not data[field1_url].startswith('http') %}

ckanext/matolabtheme/views.py

@@ -49,13 +49,13 @@ def post(self) -> Union[str, Response]:
                     )
                 )
             )
+            dark_mode=toolkit.config.get("ckanext.matolabtheme.dark_mode")
             # Set dark_mode based on whether the checkbox was checked
             data_dict['ckanext.matolabtheme.dark_mode'] = 'ckanext.matolabtheme.dark_mode' in req
             del data_dict["save"]
             # data = logic.get_action("config_option_update")(
             #     {"user": current_user.name}, data_dict
             # )
-            log.debug(data_dict)
             # Handle banner uploads AFTER calling CKAN’s function
             upload = uploader.get_uploader("admin")
             for key in list(data_dict.keys()):
@@ -103,7 +103,6 @@ def post(self) -> Union[str, Response]:
                     model.set_system_info(key, value)
                     config[key] = value
                 elif key == "ckanext.matolabtheme.dark_mode":
-                    log.debug(f"dark_mode: {data_dict[key]}")
                     value = data_dict[key]
                     model.set_system_info(key, value)
                     config[key] = value
@@ -114,7 +113,6 @@ def post(self) -> Union[str, Response]:
             error_summary = e.error_summary
             vars = dict(data=data, errors=errors, error_summary=error_summary)
             return base.render("matolabtheme/theme_config.html", extra_vars=vars)
-
         return h.redirect_to("matolabtheme.theme_config")
 
     def get(self) -> str:
@@ -126,6 +124,7 @@ def get(self) -> str:
             logic.check_access("sysadmin", context)
         except logic.NotAuthorized:
             base.abort(403, _("Need to be system administrator to administer"))
+        dark_mode=toolkit.config.get("ckanext.matolabtheme.dark_mode")
         schema = ckan.logic.schema.update_configuration_schema()
         data = {}
         for key in schema: