Fixed #11547

craftcms · Jul 5, 2022 · e723853 · e723853
1 parent 7f3f1fc
commit e723853
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Fixed a styling issue with the Edit Route modal. ([#11528](https://github.com/craftcms/cms/issues/11528))
 - Fixed a bug where assets uploaded from Assets fields weren’t retaining their original filename. ([#11530](https://github.com/craftcms/cms/issues/11530))
 - Fixed a bug where project config changes made at the end of the request lifecycle weren’t getting saved.
+- Fixed a bug where toggling entries’ and categories’ site-specific statuses from element editor slideouts wasn’t working. ([#11547](https://github.com/craftcms/cms/issues/11547))
 
 ## 4.1.0.2 - 2022-06-28
 

diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/ElementEditor.js b/src/web/assets/cp/src/js/ElementEditor.js
@@ -448,7 +448,7 @@ Craft.ElementEditor = Garnish.Base.extend(
       const $globalField = Craft.ui
         .createLightswitchField({
           label: Craft.t('app', 'Enabled for all sites'),
-          name: 'enabled',
+          name: this.namespaceInputName('enabled'),
         })
         .insertBefore($enabledForSiteField);
       $globalField.find('label').css('font-weight', 'bold');
@@ -480,7 +480,8 @@ Craft.ElementEditor = Garnish.Base.extend(
       );
 
       let serializedStatuses =
-        this.namespaceInputName('enabled') + `=${originalEnabledValue}`;
+        encodeURIComponent(this.namespaceInputName('enabled')) +
+        `=${originalEnabledValue}`;
       for (let i = 0; i < this.$siteLightswitches.length; i++) {
         const $input = this.$siteLightswitches.eq(i).data('lightswitch').$input;
         serializedStatuses +=
@@ -494,6 +495,7 @@ Craft.ElementEditor = Garnish.Base.extend(
           .replace(originalSerializedStatus, serializedStatuses)
       );
 
+      debugger;
       if (this.lastSerializedValue) {
         this.lastSerializedValue = this.lastSerializedValue.replace(
           originalSerializedStatus,
@@ -589,7 +591,7 @@ Craft.ElementEditor = Garnish.Base.extend(
       const $field = Craft.ui.createLightswitchField({
         fieldClass: `enabled-for-site-${site.id}-field`,
         label: site.name,
-        name: `enabledForSite[${site.id}]`,
+        name: this.namespaceInputName(`enabledForSite[${site.id}]`),
         on:
           typeof status != 'undefined'
             ? status