From e1296d4813ac1b677aa7a612ba0ad3b2ba62ccae Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 16 Jul 2018 17:15:30 +1200 Subject: [PATCH 1/6] FIX Filter var can be returned correctly from get variables as a fallback --- code/Report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Report.php b/code/Report.php index 200a1d2b..85741c88 100644 --- a/code/Report.php +++ b/code/Report.php @@ -349,7 +349,7 @@ class Report extends ViewableData if (Injector::inst()->has(HTTPRequest::class)) { /** @var HTTPRequest $request */ $request = Injector::inst()->get(HTTPRequest::class); - $params = $request->param('filters') ?: []; + $params = $request->param('filters') ?: $request->getVar('filters') ?: []; } $items = $this->sourceRecords($params, null, null); From f3230c78d4e3731a10a5f4c508bc68c6a8534866 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 27 Aug 2018 13:59:23 +1200 Subject: [PATCH 2/6] FIX Use requestVar() to include post vars as well as get vars --- code/Report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Report.php b/code/Report.php index 85741c88..c9727a86 100644 --- a/code/Report.php +++ b/code/Report.php @@ -349,7 +349,7 @@ class Report extends ViewableData if (Injector::inst()->has(HTTPRequest::class)) { /** @var HTTPRequest $request */ $request = Injector::inst()->get(HTTPRequest::class); - $params = $request->param('filters') ?: $request->getVar('filters') ?: []; + $params = $request->param('filters') ?: $request->requestVar('filters') ?: []; } $items = $this->sourceRecords($params, null, null); From eb7be779f2cac65606b39419f84120c90045967e Mon Sep 17 00:00:00 2001 From: Dylan Wagstaff Date: Fri, 15 Jun 2018 17:46:23 +1200 Subject: [PATCH 3/6] Add supported module badge to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7cc50613..30c71851 100644 --- a/README.md +++ b/README.md @@ -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 From ee1c77fa7de47caa1896a5034ebcb54a4de94dae Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Tue, 26 Jun 2018 17:39:51 +1200 Subject: [PATCH 4/6] Increment travis root version to 4.3.x-dev --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cab1605..10c64607 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ cache: env: global: - - COMPOSER_ROOT_VERSION=4.2.x-dev + - COMPOSER_ROOT_VERSION=4.3.x-dev - CORE_RELEASE=master matrix: @@ -31,7 +31,7 @@ before_script: - composer validate - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --no-update; fi - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --no-update; fi - - composer require silverstripe/recipe-core:4.2.x-dev silverstripe/admin:1.2.x-dev silverstripe/versioned:1.2.x-dev --no-update + - composer require silverstripe/recipe-core:4.3.x-dev silverstripe/admin:1.3.x-dev silverstripe/versioned:1.3.x-dev --no-update - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile From 786446fb670905832b6bfe49775b9c2eaff262cc Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 16 Jul 2018 17:07:00 +1200 Subject: [PATCH 5/6] NEW Use Injector to create new class instances and pass $params Also adds a couple of missing PHPDoc annotations for IDE hints --- code/Report.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/Report.php b/code/Report.php index c9727a86..dad52df2 100644 --- a/code/Report.php +++ b/code/Report.php @@ -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 = []; From 67254da18599f0fe86921098524ec3303d9de41e Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Fri, 27 Jul 2018 17:06:38 +1200 Subject: [PATCH 6/6] FIX Apply missing class to report header. --- templates/SilverStripe/Reports/Includes/ReportAdmin_Content.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/SilverStripe/Reports/Includes/ReportAdmin_Content.ss b/templates/SilverStripe/Reports/Includes/ReportAdmin_Content.ss index 03f2cfb0..5af437d1 100644 --- a/templates/SilverStripe/Reports/Includes/ReportAdmin_Content.ss +++ b/templates/SilverStripe/Reports/Includes/ReportAdmin_Content.ss @@ -2,7 +2,7 @@
<% with $EditForm %> -
+
<% include SilverStripe\\Admin\\BackLink_Button %> <% with $Controller %> <% include SilverStripe\\Admin\\CMSBreadcrumbs %>