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

Merge pull request #106 from creative-commoners/pulls/4.3/injection 

NEW Use Injector to create new class instances and pass $params
This commit is contained in:
Daniel Hensby 2018-07-16 10:06:02 +01:00 committed by GitHub
parent dce7df600b 693889cb3e
commit c90f1ed47c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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')) {
return $this->sourceRecords($params, null, null);
} else {
$query = $this->sourceQuery();
$results = new ArrayList();
$query = $this->sourceQuery($params);
$results = ArrayList::create();
foreach ($query->execute() as $data) {
$class = $this->dataClass();
$result = new $class($data);
$result = Injector::inst()->create($class, $data);
$results->push($result);
}
return $results;
@ -362,7 +362,9 @@ class Report extends ViewableData
new GridFieldDataColumns(),
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);
$displayFields = [];
$fieldCasting = [];