fix: Changing color scheme resets session settings to defaults (#7407)

fsbraun · web-flow · commit fcfe77f63725 · 2022-10-14T14:22:59.000+02:00
* Fix: incorrect saveing of color scheme in CMS.settings
* Add: changelog entry :-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -9,6 +9,7 @@ unreleased
 * Add support for tel: and mailto: URIs in Advanced Page Settings redirect field.
 * Make javascript dark mode functions available to popups as CMS.API.getColorScheme
   and CMS.API.setColorScheme
+* Fix bug where switching color scheme affects other settings
 * Unlocalize page and node ids when rendering the page tree in the admin (#7175)
 * Fixed permission denied error after page create (#6866)
 
diff --git a/cms/static/cms/js/modules/cms.base.js b/cms/static/cms/js/modules/cms.base.js
@@ -510,7 +510,12 @@ export const Helpers = {
     setColorScheme: function (scheme) {
         let body = $('html');
 
-        this.setSettings({ color_scheme: scheme });
+        if (!CMS.settings) {
+            // Settings loaded? If not, pls. load.
+            this.getSettings();
+        }
+        CMS.settings.color_scheme = scheme;
+        this.setSettings(CMS.settings);
         if (scheme === 'auto') {
             body.removeAttr('data-color-scheme');
             body.find('div.cms iframe').each(function(i, e) {
