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

Merge remote-tracking branch 'origin/3.2' into 3 

# Conflicts:
#	.travis.yml
#	composer.json
This commit is contained in:
Damian Mooyman 2015-12-22 14:21:03 +13:00
parent ccb72a10c5 af2d51125c
commit fb3083688e
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/Report.php
View File

@ -66,9 +66,15 @@ class SS_Report extends ViewableData {
public static $excluded_reports = array(
'SS_Report',
'SS_ReportWrapper',
'SideReportWrapper'
'SideReportWrapper',
'SideReport_RecentlyEdited', // @deprecated 3.2..4.0
'SideReport_EmptyPages', // @deprecated 3.2..4.0
'SideReport_BrokenVirtualPages', // @deprecated 3.2..4.0
'SideReport_BrokenRedirectorPages', // @deprecated 3.2..4.0
'SideReport_BrokenLinks', // @deprecated 3.2..4.0
'SideReport_BrokenFiles' // @deprecated 3.2..4.0
);
/**
* Return the title of this report.
*
@ -105,7 +111,7 @@ class SS_Report extends ViewableData {
*/
public function sourceQuery($params) {
if($this->hasMethod('sourceRecords')) {
return $this->sourceRecords()->dataQuery();
return $this->sourceRecords($params, null, null)->dataQuery();
} else {
user_error("Please override sourceQuery()/sourceRecords() and columns() or, if necessary, override getReportField()", E_USER_ERROR);
}

23
composer.json
View File

@ -1,23 +1,30 @@
{
"name": "silverstripe/reports",
"type": "silverstripe-module",
"description": "Reports module for SilverStripe CMS",
"homepage": "http://silverstripe.org",
"license": "BSD-3-Clause",
"keywords": ["silverstripe", "cms", "reports"],
"authors": [{
"name": "SilverStripe",
"homepage": "http://silverstripe.com"
}, {
"name": "The SilverStripe Community",
"homepage": "http://silverstripe.org"
}],
"authors": [
{
"name": "SilverStripe",
"homepage": "http://silverstripe.com"
},
{
"name": "The SilverStripe Community",
"homepage": "http://silverstripe.org"
}
],
"require": {
"php": ">=5.3.3",
"silverstripe/framework": ">=3.1.x-dev"
"silverstripe/framework": "~3.3"
},
"extra": {
"branch-alias": {
"3.x-dev": "3.3.x-dev"
}
},
"require-dev": {
"phpunit/PHPUnit": "~3.7"
}
}