Merge branch '4'

This commit is contained in:
Daniel Hensby 2018-07-23 17:17:17 +01:00
commit 94e177b4eb
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
3 changed files with 14 additions and 4 deletions

View File

@ -1,6 +1,7 @@
# Reports
[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-reports.png?branch=master)](http://travis-ci.org/silverstripe/silverstripe-reports)
[![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
## Introduction

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 = [];

7
lang/sv.yml Normal file
View File

@ -0,0 +1,7 @@
sv:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Rapporter
ReportTitle: Titel
SilverStripe\Reports\SideReport:
OtherGroupTitle: Annat
REPEMPTY: 'Rapporten {title} är tom.'