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

BUGFIX Calling parent constructor on ModelAdmin classes so $this->class gets set properly and doesn't confuse the RequestHandler

Browse Source 
BUGFIX Add magic methods on ModelAdmin to $allowed_actions (regression from r64988)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65180 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-11-04 01:32:45 +00:00
parent 6afd96eba4
commit f2bf599795
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/ModelAdmin.php
View File

@ -38,6 +38,9 @@ abstract class ModelAdmin extends LeftAndMain {
*/ */
protected static $managed_models = null; protected static $managed_models = null;
/**
* More actions are dynamically added in {@link defineMethods()} below.
*/
public static $allowed_actions = array( public static $allowed_actions = array(
'add', 'add',
'edit', 'edit',
@ -138,6 +141,7 @@ abstract class ModelAdmin extends LeftAndMain {
parent::defineMethods(); parent::defineMethods();
foreach($this->getManagedModels() as $ClassName) { foreach($this->getManagedModels() as $ClassName) {
$this->addWrapperMethod($ClassName, 'bindModelController'); $this->addWrapperMethod($ClassName, 'bindModelController');
self::$allowed_actions[] = $ClassName;
} }
} }
@ -364,6 +368,8 @@ class ModelAdmin_CollectionController extends Controller {
function __construct($parent, $model) { function __construct($parent, $model) {
$this->parentController = $parent; $this->parentController = $parent;
$this->modelClass = $model; $this->modelClass = $model;
parent::__construct();
} }
/** /**
@ -436,6 +442,7 @@ class ModelAdmin_CollectionController extends Controller {
$form->setHTMLID("Form_SearchForm_" . $this->modelClass); $form->setHTMLID("Form_SearchForm_" . $this->modelClass);
$clearAction->useButtonTag = true; $clearAction->useButtonTag = true;
$clearAction->addExtraClass('minorAction'); $clearAction->addExtraClass('minorAction');
return $form; return $form;
} }
@ -670,6 +677,8 @@ class ModelAdmin_RecordController extends Controller {
$modelName = $parentController->getModelClass(); $modelName = $parentController->getModelClass();
$recordID = $request->param('Action'); $recordID = $request->param('Action');
$this->currentRecord = DataObject::get_by_id($modelName, $recordID); $this->currentRecord = DataObject::get_by_id($modelName, $recordID);
parent::__construct();
} }
/** /**