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

MINOR Ensuring a valid Folder object is returned from AssetAdmin->currentPage() to avoid breaking AssetAdmin->getEditForm(), e.g. when a GridField search is conducted

Browse Source
This commit is contained in:
Ingo Schommer 2012-02-23 16:25:35 +01:00
parent c32595d1c8
commit c582f08ea3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/AssetAdmin.php
View File

@ -301,9 +301,10 @@ JS
public function currentPage() { public function currentPage() {
$id = $this->currentPageID(); $id = $this->currentPageID();
if($id && is_numeric($id)) { if($id && is_numeric($id)) {
return DataObject::get_by_id('File', $id); return DataObject::get_by_id('Folder', $id);
} else if($id == 'root') { } else {
return singleton('File'); // ID is either '0' or 'root'
return singleton('Folder');
} }
} }