From 9ec437d0334156a55cf004422cdde93962947224 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Wed, 7 Nov 2018 17:57:46 +1300 Subject: [PATCH 1/7] Update translations --- lang/da.yml | 7 +++++++ lang/nl.yml | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 lang/da.yml create mode 100644 lang/nl.yml diff --git a/lang/da.yml b/lang/da.yml new file mode 100644 index 00000000..c89332ae --- /dev/null +++ b/lang/da.yml @@ -0,0 +1,7 @@ +da: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Rapporter + ReportTitle: Titel + SilverStripe\Reports\SideReport: + OtherGroupTitle: Andre + REPEMPTY: 'Rapporten {title} er tom.' diff --git a/lang/nl.yml b/lang/nl.yml new file mode 100644 index 00000000..f2539bb3 --- /dev/null +++ b/lang/nl.yml @@ -0,0 +1,7 @@ +nl: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Rapporten + ReportTitle: Naam + SilverStripe\Reports\SideReport: + OtherGroupTitle: Overig + REPEMPTY: 'Het {title} rapport is leeg.' From c48cb248dcee8c2d4bd682af68d611dd496fcd86 Mon Sep 17 00:00:00 2001 From: Vagrant Default User Date: Wed, 7 Nov 2018 21:37:37 +1300 Subject: [PATCH 2/7] Update translations --- lang/da.yml | 7 +++++++ lang/nl.yml | 7 +++++++ lang/pl.yml | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 lang/da.yml create mode 100644 lang/nl.yml create mode 100644 lang/pl.yml diff --git a/lang/da.yml b/lang/da.yml new file mode 100644 index 00000000..c89332ae --- /dev/null +++ b/lang/da.yml @@ -0,0 +1,7 @@ +da: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Rapporter + ReportTitle: Titel + SilverStripe\Reports\SideReport: + OtherGroupTitle: Andre + REPEMPTY: 'Rapporten {title} er tom.' diff --git a/lang/nl.yml b/lang/nl.yml new file mode 100644 index 00000000..f2539bb3 --- /dev/null +++ b/lang/nl.yml @@ -0,0 +1,7 @@ +nl: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Rapporten + ReportTitle: Naam + SilverStripe\Reports\SideReport: + OtherGroupTitle: Overig + REPEMPTY: 'Het {title} rapport is leeg.' diff --git a/lang/pl.yml b/lang/pl.yml new file mode 100644 index 00000000..7f200b85 --- /dev/null +++ b/lang/pl.yml @@ -0,0 +1,7 @@ +pl: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Raporty + ReportTitle: Tytuł + SilverStripe\Reports\SideReport: + OtherGroupTitle: Inne + REPEMPTY: 'Raport {title} jest pusty' From dea66bc037e8531c8746a397c2ba21e84a94c464 Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Thu, 8 Nov 2018 16:25:42 +1300 Subject: [PATCH 3/7] Update translations --- lang/da.yml | 7 +++++++ lang/nl.yml | 7 +++++++ lang/pl.yml | 7 +++++++ lang/sv.yml | 7 +++++++ 4 files changed, 28 insertions(+) create mode 100644 lang/da.yml create mode 100644 lang/nl.yml create mode 100644 lang/pl.yml create mode 100644 lang/sv.yml diff --git a/lang/da.yml b/lang/da.yml new file mode 100644 index 00000000..c89332ae --- /dev/null +++ b/lang/da.yml @@ -0,0 +1,7 @@ +da: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Rapporter + ReportTitle: Titel + SilverStripe\Reports\SideReport: + OtherGroupTitle: Andre + REPEMPTY: 'Rapporten {title} er tom.' diff --git a/lang/nl.yml b/lang/nl.yml new file mode 100644 index 00000000..f2539bb3 --- /dev/null +++ b/lang/nl.yml @@ -0,0 +1,7 @@ +nl: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Rapporten + ReportTitle: Naam + SilverStripe\Reports\SideReport: + OtherGroupTitle: Overig + REPEMPTY: 'Het {title} rapport is leeg.' diff --git a/lang/pl.yml b/lang/pl.yml new file mode 100644 index 00000000..7f200b85 --- /dev/null +++ b/lang/pl.yml @@ -0,0 +1,7 @@ +pl: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Raporty + ReportTitle: Tytuł + SilverStripe\Reports\SideReport: + OtherGroupTitle: Inne + REPEMPTY: 'Raport {title} jest pusty' diff --git a/lang/sv.yml b/lang/sv.yml new file mode 100644 index 00000000..ce219356 --- /dev/null +++ b/lang/sv.yml @@ -0,0 +1,7 @@ +sv: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Rapporter + ReportTitle: Titel + SilverStripe\Reports\SideReport: + OtherGroupTitle: Annat + REPEMPTY: 'Rapporten {title} är tom.' From a344110a10acc4897b864c714c9b202b633a06a7 Mon Sep 17 00:00:00 2001 From: Dylan Wagstaff Date: Fri, 15 Jun 2018 17:46:23 +1200 Subject: [PATCH 4/7] 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 ebe98f487a035986b3b68b51d9546b774f7665c8 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Tue, 26 Jun 2018 17:39:51 +1200 Subject: [PATCH 5/7] 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 9270206c3bd2fe35bb263ad43ad3a5d87360873a Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 16 Jul 2018 17:07:00 +1200 Subject: [PATCH 6/7] 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 bc70b87721c8278111e39e0af69db1052af7333f Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Fri, 27 Jul 2018 17:06:38 +1200 Subject: [PATCH 7/7] 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 %>