Compare commits
19 Commits
Author | SHA1 | Date |
---|---|---|
github-actions | 6d1d9774e3 | |
Guy Sartorelli | ca9a472b14 | |
Steve Boyd | 504dfcd919 | |
github-actions | ede73e8ef0 | |
Steve Boyd | 454a9fd10b | |
Guy Sartorelli | 84f507cb9c | |
Sabina Talipova | 6aa3f02820 | |
Guy Sartorelli | 53a2bcc998 | |
Steve Boyd | 28c43ca5a3 | |
Steve Boyd | f7a54597e9 | |
Maxime Rainville | 3628238be0 | |
Steve Boyd | 72f030fee6 | |
Guy Sartorelli | 17ed7323fd | |
Guy Sartorelli | 12c712b895 | |
Guy Sartorelli | a0fc77b030 | |
Sabina Talipova | 23786e5daf | |
Guy Sartorelli | da1a1489af | |
Guy Sartorelli | 050c683f8b | |
Steve Boyd | 65bc353f43 |
|
@ -1,10 +1,10 @@
|
||||||
name: Keepalive
|
name: Keepalive
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
# At 6:30 PM UTC, on day 7 of the month
|
||||||
# The 4th of every month at 10:50am UTC
|
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '50 10 4 * *'
|
- cron: '30 18 7 * *'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
keepalive:
|
keepalive:
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
name: Merge-up
|
||||||
|
|
||||||
|
on:
|
||||||
|
# At 11:00 AM UTC, only on Friday
|
||||||
|
schedule:
|
||||||
|
- cron: '0 11 * * 5'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
merge-up:
|
||||||
|
name: Merge-up
|
||||||
|
# Only run cron on the silverstripe account
|
||||||
|
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Merge-up
|
||||||
|
uses: silverstripe/gha-merge-up@v1
|
|
@ -1,9 +0,0 @@
|
||||||
mappings:
|
|
||||||
SS_Report: SilverStripe\Reports\Report
|
|
||||||
SilverStripe\Reports\SS_Report: SilverStripe\Reports\Report
|
|
||||||
SS_ReportWrapper: SilverStripe\Reports\ReportWrapper
|
|
||||||
SilverStripe\Reports\SS_ReportWrapper: SilverStripe\Reports\ReportWrapper
|
|
||||||
ReportAdmin: SilverStripe\Reports\ReportAdmin
|
|
||||||
SideReportView: SilverStripe\Reports\SideReportView
|
|
||||||
SideReportWrapper: SilverStripe\Reports\SideReportWrapper
|
|
||||||
SideReport: SilverStripe\Reports\SideReportView
|
|
2
LICENSE
2
LICENSE
|
@ -1,4 +1,4 @@
|
||||||
Copyright (c) 2017, SilverStripe Limited
|
Copyright (c) 2017, Silverstripe Limited
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||||
|
|
13
README.md
13
README.md
|
@ -3,15 +3,16 @@
|
||||||
[![CI](https://github.com/silverstripe/silverstripe-reports/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-reports/actions/workflows/ci.yml)
|
[![CI](https://github.com/silverstripe/silverstripe-reports/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-reports/actions/workflows/ci.yml)
|
||||||
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
|
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
```sh
|
||||||
|
composer require silverstripe/reports
|
||||||
|
```
|
||||||
|
|
||||||
## Introduction
|
## Introduction
|
||||||
|
|
||||||
This module contains the API's for building Reports that are displayed in the
|
This module contains the API's for building Reports that are displayed in the
|
||||||
Silverstripe backend. This module replaces the built-in reports API from earlier
|
Silverstripe backend.
|
||||||
versions of Silverstripe (2.4 and 3.0).
|
|
||||||
|
|
||||||
## Requirements
|
|
||||||
|
|
||||||
* Silverstripe 4.0
|
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|
||||||
|
|
|
@ -102,7 +102,6 @@ abstract class ReportWrapper extends Report
|
||||||
|
|
||||||
public function group()
|
public function group()
|
||||||
{
|
{
|
||||||
/** @skipUpgrade */
|
|
||||||
return $this->baseReport->hasMethod('group') ? $this->baseReport->group() : 'Group';
|
return $this->baseReport->hasMethod('group') ? $this->baseReport->group() : 'Group';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,17 +20,17 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.4 || ^8.0",
|
"php": "^8.1",
|
||||||
"silverstripe/framework": "^4.11",
|
"silverstripe/framework": "^5",
|
||||||
"silverstripe/admin": "^1.6@dev",
|
"silverstripe/admin": "^2",
|
||||||
"silverstripe/versioned": "^1.6@dev",
|
"silverstripe/versioned": "^2",
|
||||||
"silverstripe/config": "^1.0@dev",
|
"silverstripe/config": "^2",
|
||||||
"silverstripe/assets": "^1.6@dev",
|
"silverstripe/assets": "^2",
|
||||||
"silverstripe/vendor-plugin": "^1"
|
"silverstripe/vendor-plugin": "^2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^9.5",
|
"phpunit/phpunit": "^9.6",
|
||||||
"squizlabs/php_codesniffer": "^3.0"
|
"squizlabs/php_codesniffer": "^3.7"
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"expose": [
|
"expose": [
|
||||||
|
@ -45,4 +45,4 @@
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"prefer-stable": true
|
"prefer-stable": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ class ReportAdminTest extends SapphireTest
|
||||||
$this->assertCount(2, $breadcrumbs);
|
$this->assertCount(2, $breadcrumbs);
|
||||||
$map = $breadcrumbs[0]->toMap();
|
$map = $breadcrumbs[0]->toMap();
|
||||||
$this->assertSame('Reports', $map['Title']);
|
$this->assertSame('Reports', $map['Title']);
|
||||||
$this->assertSame('admin/reports/', $map['Link']);
|
$this->assertSame('admin/reports', $map['Link']);
|
||||||
|
|
||||||
$map = $breadcrumbs[1]->toMap();
|
$map = $breadcrumbs[1]->toMap();
|
||||||
$this->assertSame('Fake report', $map['Title']);
|
$this->assertSame('Fake report', $map['Title']);
|
||||||
|
@ -36,7 +36,7 @@ class ReportAdminTest extends SapphireTest
|
||||||
|
|
||||||
$map = $breadcrumbs[0]->toMap();
|
$map = $breadcrumbs[0]->toMap();
|
||||||
$this->assertSame('Reports', $map['Title']);
|
$this->assertSame('Reports', $map['Title']);
|
||||||
$this->assertSame('admin/reports/', $map['Link']);
|
$this->assertSame('admin/reports', $map['Link']);
|
||||||
|
|
||||||
$map = $breadcrumbs[1]->toMap();
|
$map = $breadcrumbs[1]->toMap();
|
||||||
$this->assertSame('Fake report title', $map['Title']);
|
$this->assertSame('Fake report title', $map['Title']);
|
||||||
|
|
Loading…
Reference in New Issue