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

MINOR Making canEdit() method optional on objects handled by LeftAndMain subclasses

This commit is contained in:
Ingo Schommer 2011-04-19 18:44:46 +12:00
parent 5bd43af85f
commit 3c544340ee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/code/LeftAndMain.php
View File

@ -454,7 +454,7 @@ class LeftAndMain extends Controller {
public function getRecord($id) {
$className = $this->stat('tree_class');
if($id instanceof $className) {
if($className && $id instanceof $className) {
return $id;
} else if(is_numeric($id)) {
return DataObject::get_by_id($className, $id);
@ -764,7 +764,7 @@ class LeftAndMain extends Controller {
$actions = $record->getCMSActions();
// add default actions if none are defined
if(!$actions || !$actions->Count()) {
if($record->canEdit()) {
if($record->hasMethod('canEdit') && $record->canEdit()) {
$actions->push(new FormAction('save',_t('CMSMain.SAVE','Save')));
}
}
@ -794,7 +794,7 @@ class LeftAndMain extends Controller {
$form->unsetValidator();
}
if(!$record->canEdit()) {
if($record->hasMethod('canEdit') && !$record->canEdit()) {
$readonlyFields = $form->Fields()->makeReadonly();
$form->setFields($readonlyFields);
}