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

Remove redundant CMSSecurity.js dist file

Browse Source 
Cleanup GridFieldFilterHeader / GridFieldSortableHeader
This commit is contained in:
Damian Mooyman 2017-01-11 12:00:01 +13:00
parent ae2861d487
commit d9034f5bfc
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/client/dist/js/CMSSecurity.js vendored
View File

@ -1,4 +0,0 @@
webpackJsonp([0],[function(t,n,e){"use strict"
function s(t){return t&&t.__esModule?t:{"default":t}}var u=e(1),i=s(u)
i["default"].noConflict(),i["default"].entwine.warningLevel=i["default"].entwine.WARN_LEVEL_BESTPRACTISE,i["default"].entwine("ss",function(t){t('.cms input[type="submit"], .cms button, .cms input[type="reset"], .cms .ss-ui-button').entwine({
onadd:function n(){this.addClass("ss-ui-button"),this.data("button")||this.button(),this._super()},onremove:function e(){this.data("button")&&this.button("destroy"),this._super()}})})}])

3
src/Forms/GridField/GridFieldFilterHeader.php
View File

@ -137,6 +137,7 @@ class GridFieldFilterHeader implements GridField_HTMLProvider, GridField_DataMan
/**
* Returns whether this {@link GridField} has any columns to sort on at all.
*
* @param GridField $gridField
* @return boolean
*/
public function canFilterAnyColumns($gridField)
@ -148,8 +149,6 @@ class GridFieldFilterHeader implements GridField_HTMLProvider, GridField_DataMan
}
$columns = $gridField->getColumns();
$filterArguments = $gridField->State->GridFieldFilterHeader->Columns->toArray();
foreach ($columns as $columnField) {
$metadata = $gridField->getColumnMetadata($columnField);
$title = $metadata['title'];

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

@ -188,7 +188,7 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
}
} else {
if ($currentColumn == count($columns)) {
$filter = $gridField->getConfig()->getComponentByType('SilverStripe\\Forms\\GridField\\GridFieldFilterHeader');
$filter = $gridField->getConfig()->getComponentByType(GridFieldFilterHeader::class);
if ($filter && $filter->canFilterAnyColumns($gridField)) {
$field = new LiteralField(