tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX Allowing 'root' as ID parameter in LeftAndMain->getEditForm() (necessary for AssetAdmin root folders etc.)

This commit is contained in:
Ingo Schommer 2011-05-02 12:36:16 +12:00
parent 485ea3e41d
commit 40786cddd3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/code/LeftAndMain.php
View File

@ -459,6 +459,8 @@ class LeftAndMain extends Controller {
$className = $this->stat('tree_class');
if($className && $id instanceof $className) {
return $id;
} else if($id == 'root') {
return singleton($className);
} else if(is_numeric($id)) {
return DataObject::get_by_id($className, $id);
} else {
@ -751,7 +753,7 @@ class LeftAndMain extends Controller {
if(is_object($id)) {
$record = $id;
} else {
$record = ($id && $id != "root") ? $this->getRecord($id) : null;
$record = $this->getRecord($id);
if($record && !$record->canView()) return Security::permissionFailure($this);
}