mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #3139 from tractorcow/pulls/3.1/fix-gridfield-sorting
BUG Fix grid field showing search without search component added
This commit is contained in:
commit
34304cf6e4
@ -48,16 +48,19 @@
|
||||
// multiple relationships via keyboard.
|
||||
if(focusedElName) self.find(':input[name="' + focusedElName + '"]').focus();
|
||||
|
||||
var content;
|
||||
if(ajaxOpts.data[0].filter=="show"){
|
||||
content = '<span class="non-sortable"></span>';
|
||||
self.addClass('show-filter').find('.filter-header').show();
|
||||
}else{
|
||||
content = '<button name="showFilter" class="ss-gridfield-button-filter trigger"></button>';
|
||||
self.removeClass('show-filter').find('.filter-header').hide();
|
||||
}
|
||||
// Update filter
|
||||
if(self.find('.filter-header').length) {
|
||||
var content;
|
||||
if(ajaxOpts.data[0].filter=="show") {
|
||||
content = '<span class="non-sortable"></span>';
|
||||
self.addClass('show-filter').find('.filter-header').show();
|
||||
} else {
|
||||
content = '<button name="showFilter" class="ss-gridfield-button-filter trigger"></button>';
|
||||
self.removeClass('show-filter').find('.filter-header').hide();
|
||||
}
|
||||
|
||||
self.find('.sortable-header th:last').html(content);
|
||||
self.find('.sortable-header th:last').html(content);
|
||||
}
|
||||
|
||||
form.removeClass('loading');
|
||||
if(successCallback) successCallback.apply(this, arguments);
|
||||
|
Loading…
Reference in New Issue
Block a user