Merge branch '2.3' into 2

silverstripe · Jan 28, 2025 · db4002f · db4002f
2 parents 02b164f + 56192c9
commit db4002f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/legacy/GridField.js b/client/src/legacy/GridField.js
@@ -172,11 +172,14 @@ $.entwine('ss', function($) {
       );
     },
 
+    // Adds an actions column for the search action if it does not exist already
     fixColumns: function (visible) {
       this.find('.sortable-header').append('<th class="main col-Actions" />');
       this.find('tbody tr').each(function () {
         var cell = $(this).find('td:last');
-        cell.attr('colspan', 2);
+        // Note we need to add 1 to the current column span, because we're going to add a new column
+        var colspan = cell.attr('colspan') ?? 1;
+        cell.attr('colspan', Number(colspan) + 1);
       });
       var $extraCell = $('<th class="extra" />');
       $('.grid-field__filter-header th:last .action').each(function() {