tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3139 from tractorcow/pulls/3.1/fix-gridfield-sorting

Browse Source 
BUG Fix grid field showing search without search component added
This commit is contained in:
Stig Lindqvist 2014-06-14 17:10:17 +12:00
commit 34304cf6e4
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javascript/GridField.js
View File

@ -48,16 +48,19 @@
// multiple relationships via keyboard. // multiple relationships via keyboard.
if(focusedElName) self.find(':input[name="' + focusedElName + '"]').focus(); if(focusedElName) self.find(':input[name="' + focusedElName + '"]').focus();
// Update filter
if(self.find('.filter-header').length) {
var content; var content;
if(ajaxOpts.data[0].filter=="show"){ if(ajaxOpts.data[0].filter=="show") {
content = '<span class="non-sortable"></span>'; content = '<span class="non-sortable"></span>';
self.addClass('show-filter').find('.filter-header').show(); self.addClass('show-filter').find('.filter-header').show();
}else{ } else {
content = '<button name="showFilter" class="ss-gridfield-button-filter trigger"></button>'; content = '<button name="showFilter" class="ss-gridfield-button-filter trigger"></button>';
self.removeClass('show-filter').find('.filter-header').hide(); 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'); form.removeClass('loading');
if(successCallback) successCallback.apply(this, arguments); if(successCallback) successCallback.apply(this, arguments);