Merge pull request #10736 from creative-commoners/pulls/pulls/5.0/dou…

…ble-sort/pulls/5.0/double-filter FIX Remove legacy filter icon
silverstripe · Mar 28, 2023 · d30cd6f · d30cd6f
2 parents 62f6177 + 84273b8
commit d30cd6f
Showing 1 changed file with 1 addition and 19 deletions.
diff --git a/src/Forms/GridField/GridFieldSortableHeader.php b/src/Forms/GridField/GridFieldSortableHeader.php
@@ -188,25 +188,7 @@ public function getHTMLFragments($gridField)
                     }
                 }
             } else {
-                if ($currentColumn == count($columns ?? [])) {
-                    $filter = $gridField->getConfig()->getComponentByType(GridFieldFilterHeader::class);
-
-                    if ($filter && $filter->canFilterAnyColumns($gridField)) {
-                        $field = new LiteralField(
-                            $fieldName,
-                            sprintf(
-                                '<button type="button" name="showFilter" aria-label="%s" title="%s"' .
-                                ' class="btn btn-secondary font-icon-search btn--no-text btn--icon-large grid-field__filter-open"></button>',
-                                _t('SilverStripe\\Forms\\GridField\\GridField.OpenFilter', "Open search and filter"),
-                                _t('SilverStripe\\Forms\\GridField\\GridField.OpenFilter', "Open search and filter")
-                            )
-                        );
-                    } else {
-                        $field = new LiteralField($fieldName, '<span class="non-sortable">' . $title . '</span>');
-                    }
-                } else {
-                    $field = new LiteralField($fieldName, '<span class="non-sortable">' . $title . '</span>');
-                }
+                $field = new LiteralField($fieldName, '<span class="non-sortable">' . $title . '</span>');
             }
             $forTemplate->Fields->push($field);
         }