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

Merge remote branch 'origin/master' into translation-staging

Browse Source
This commit is contained in:
TeamCity 2012-10-31 11:57:06 +13:00
commit 6327d72b3c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/AssetAdmin.php
View File

@ -140,8 +140,8 @@ JS
// File listing // File listing
$gridFieldConfig = GridFieldConfig::create()->addComponents( $gridFieldConfig = GridFieldConfig::create()->addComponents(
new GridFieldToolbarHeader(), new GridFieldToolbarHeader(),
new GridFieldFilterHeader(),
new GridFieldSortableHeader(), new GridFieldSortableHeader(),
new GridFieldFilterHeader(),
new GridFieldDataColumns(), new GridFieldDataColumns(),
new GridFieldPaginator(15), new GridFieldPaginator(15),
new GridFieldEditButton(), new GridFieldEditButton(),