Merge pull request #16178 from craftcms/bugfix/16177-default-table-co…

…ls-for-new-custom-source Bugfix/16177 default table cols for new custom source
craftcms · Nov 22, 2024 · cb1486a · cb1486a
2 parents 29ff467 + 9390a9d
commit cb1486a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Fixed a bug where `craft\events\ApplyFieldSaveEvent::$field` wasn’t being set consistently by `craft\services\Fields::EVENT_BEFORE_APPLY_FIELD_SAVE`. ([#16156](https://github.com/craftcms/cms/issues/16156))
 - Fixed an error that could occur when creating a nested element. ([#16162](https://github.com/craftcms/cms/pull/16162))
 - Fixed a bug where custom fields weren’t being displayed at 25% width when they should have. ([#16165](https://github.com/craftcms/cms/pull/16170))
+- Fixed a bug where the “Default Table Columns” element source settings could contain duplicate checkbox options. ([#16177](https://github.com/craftcms/cms/issues/16177))
 
 ## 5.5.2 - 2024-11-19
 

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/CustomizeSourcesModal.js b/src/web/assets/cp/src/js/CustomizeSourcesModal.js
@@ -991,7 +991,15 @@ Craft.CustomizeSourcesModal.CustomSource =
     availableTableAttributes: function () {
       const attributes = this.base();
       if (this.isNew) {
-        attributes.push(...this.modal.customFieldAttributes);
+        let existingFieldAttributes = [];
+        let customFieldAttributes = [];
+        this.modal.customFieldAttributes.forEach((item) => {
+          if (existingFieldAttributes.indexOf(item[0]) == -1) {
+            existingFieldAttributes.push(item[0]);
+            customFieldAttributes.push(item);
+          }
+        });
+        attributes.push(...customFieldAttributes);
       }
       return attributes;
     },