tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-28 20:29:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10736 from creative-commoners/pulls/pulls/5.0/double-sort/pulls/5.0/double-filter

Browse Source 
FIX Remove legacy filter icon
This commit is contained in:
Guy Sartorelli 2023-03-29 10:37:50 +13:00 committed by GitHub
commit d30cd6f68e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Forms/GridField/GridFieldSortableHeader.php
View File

@ -188,25 +188,7 @@ class GridFieldSortableHeader extends AbstractGridFieldComponent implements Grid
}
}
} 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);
}