TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:octobercms/october into develop

This commit is contained in:
alekseybobkov 2015-01-15 21:35:53 -08:00
parent 39c4ec6371 6f5e3c7682
commit 291a5b46aa
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/backend/widgets/Lists.php
View File

@ -1005,6 +1005,7 @@ class Lists extends WidgetBase
*/
if ($this->sortColumn === null || !$this->isSortable($this->sortColumn)) {
$columns = $this->visibleColumns ?: $this->getVisibleListColumns();
$columns = array_filter($columns, function($column){ return $column->sortable; });
$this->sortColumn = key($columns);
$this->sortDirection = 'desc';
}
@ -1035,15 +1036,9 @@ class Lists extends WidgetBase
}
$columns = $this->getColumns();
$sortable = [];
foreach ($columns as $column) {
if (!$column->sortable) {
continue;
}
$sortable[$column->columnName] = $column;
}
$sortable = array_filter($columns, function($column){
return $column->sortable;
});
return $this->sortableColumns = $sortable;
}