Merge branch 'develop' into fix/addDeprBrokenLinks

django-cms · vinitkumar · Nov 3, 2022 · Feb 9, 2022 · Feb 11, 2022 · Feb 18, 2022
commit f289a985fbce9fc65e9b11f607ddec39c8343bfe
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,8 +5,15 @@ Changelog
 unreleased
 ==========
 
+* Support for django 4.1
+* Allow to partially override ``CMS_CACHE_DURATIONS``
+* 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)
+* Improved performance when using CMS_RAW_ID_USERS=True on a Postgres DB with many users
 * Deprecate usage of legacy SEND_BROKEN_LINK_EMAILS setting (removed since Django 1.8)
 
 

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) {