tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.3' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2016-04-26 02:30:18 +01:00
commit fe17073355
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -12,12 +12,14 @@ php:
- 7.0 - 7.0
env: env:
- DB=MYSQL CORE_RELEASE=3 - DB=MYSQL CORE_RELEASE=3.3
matrix: matrix:
include: include:
- php: 5.6 - php: 5.6
env: DB=PGSQL CORE_RELEASE=3 env: DB=PGSQL CORE_RELEASE=3
- php: 5.6
env: DB=PGSQL CORE_RELEASE=3.2
allow_failures: allow_failures:
- php: 7.0 - php: 7.0

5
code/SideReport.php
View File

@ -88,8 +88,9 @@ class SideReportView extends ViewableData {
} }
if(isset($info['link']) && $info['link']) { if(isset($info['link']) && $info['link']) {
$linkBase = singleton('CMSPageEditController')->Link('show') . '/'; $link = ($info['link'] === true && $record->hasMethod('CMSEditLink'))
$link = ($info['link'] === true) ? $linkBase . $record->ID : $info['link']; ? $record->CMSEditLink()
: $info['link'];
return $prefix . "<a $classClause href=\"$link\">$val</a>"; return $prefix . "<a $classClause href=\"$link\">$val</a>";
} else { } else {
return $prefix . "<span $classClause>$val</span>"; return $prefix . "<span $classClause>$val</span>";

2
composer.json
View File

@ -16,7 +16,7 @@
} }
], ],
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3,<7",
"silverstripe/framework": "~3.3" "silverstripe/framework": "~3.3"
}, },
"extra": { "extra": {