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

BUG Actioned feedback

This commit is contained in:
Christopher Joe 2017-11-27 14:29:19 +13:00
parent 5b335ad511
commit 86f845972f
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/Report.php
View File

@ -86,8 +86,6 @@ class Report extends ViewableData
*/ */
protected $sort = 0; protected $sort = 0;
protected $params = [];
/** /**
* Reports which should not be collected and returned in get_reports * Reports which should not be collected and returned in get_reports
* *
@ -100,15 +98,6 @@ class Report extends ViewableData
SideReportWrapper::class, SideReportWrapper::class,
]; ];
public function __construct()
{
if (Injector::inst()->has(HTTPRequest::class)) {
$this->params = Injector::inst()->get(HTTPRequest::class)->param('filters');
}
parent::__construct();
}
/** /**
* Return the title of this report. * Return the title of this report.
* *
@ -341,7 +330,13 @@ class Report extends ViewableData
*/ */
public function getReportField() public function getReportField()
{ {
$items = $this->sourceRecords($this->params, null, null); $params = [];
if (Injector::inst()->has(HTTPRequest::class)) {
/** @var HTTPRequest $request */
$request = Injector::inst()->get(HTTPRequest::class);
$params = $request->param('filters') ?: [];
}
$items = $this->sourceRecords($params, null, null);
$gridFieldConfig = GridFieldConfig::create()->addComponents( $gridFieldConfig = GridFieldConfig::create()->addComponents(
@ -349,19 +344,20 @@ class Report extends ViewableData
new GridFieldPrintButton('buttons-before-left'), new GridFieldPrintButton('buttons-before-left'),
new GridFieldExportButton('buttons-before-left'), new GridFieldExportButton('buttons-before-left'),
new GridFieldToolbarHeader(), new GridFieldToolbarHeader(),
new GridFieldSortableHeader(),
new GridFieldDataColumns(), new GridFieldDataColumns(),
new GridFieldPaginator() new GridFieldPaginator()
); );
$gridField = new GridField('Report', null, $items, $gridFieldConfig); $gridField = new GridField('Report', null, $items, $gridFieldConfig);
$columns = $gridField->getConfig()->getComponentByType('SilverStripe\\Forms\\GridField\\GridFieldDataColumns'); $columns = $gridField->getConfig()->getComponentByType(GridFieldDataColumns::class);
$displayFields = array(); $displayFields = [];
$fieldCasting = array(); $fieldCasting = [];
$fieldFormatting = array(); $fieldFormatting = [];
// Parse the column information // Parse the column information
foreach ($this->columns() as $source => $info) { foreach ($this->columns() as $source => $info) {
if (is_string($info)) { if (is_string($info)) {
$info = array('title' => $info); $info = ['title' => $info];
} }
if (isset($info['formatting'])) { if (isset($info['formatting'])) {