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

NEW Use Injector to create new class instances and pass $params 

Also adds a couple of missing PHPDoc annotations for IDE hints
This commit is contained in:
Robbie Averill 2018-07-16 17:07:00 +12:00 committed by Aaron Carlino
parent ebe98f487a
commit 9270206c3b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/Report.php
View File

@ -164,11 +164,11 @@ class Report extends ViewableData
if ($this->hasMethod('sourceRecords')) { if ($this->hasMethod('sourceRecords')) {
return $this->sourceRecords($params, null, null); return $this->sourceRecords($params, null, null);
} else { } else {
$query = $this->sourceQuery(); $query = $this->sourceQuery($params);
$results = new ArrayList(); $results = ArrayList::create();
foreach ($query->execute() as $data) { foreach ($query->execute() as $data) {
$class = $this->dataClass(); $class = $this->dataClass();
$result = new $class($data); $result = Injector::inst()->create($class, $data);
$results->push($result); $results->push($result);
} }
return $results; return $results;
@ -362,7 +362,9 @@ class Report extends ViewableData
new GridFieldDataColumns(), new GridFieldDataColumns(),
new GridFieldPaginator() new GridFieldPaginator()
); );
$gridField = new GridField('Report', null, $items, $gridFieldConfig); /** @var GridField $gridField */
$gridField = GridField::create('Report', null, $items, $gridFieldConfig);
/** @var GridFieldDataColumns $columns */
$columns = $gridField->getConfig()->getComponentByType(GridFieldDataColumns::class); $columns = $gridField->getConfig()->getComponentByType(GridFieldDataColumns::class);
$displayFields = []; $displayFields = [];
$fieldCasting = []; $fieldCasting = [];