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'

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

2
.travis.yml
View File

@ -16,8 +16,8 @@ matrix:
include:
- php: 5.6
env: DB=PGSQL CORE_RELEASE=master
allow_failures:
- php: 7.0
env: DB=PGSQL CORE_RELEASE=master
before_script:
- composer self-update || true

5
code/SideReport.php
View File

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

8
composer.json
View File

@ -7,12 +7,12 @@
"keywords": ["silverstripe", "cms", "reports"],
"authors": [
{
"name": "SilverStripe",
"homepage": "http://silverstripe.com"
"name": "SilverStripe",
"homepage": "http://silverstripe.com"
},
{
"name": "The SilverStripe Community",
"homepage": "http://silverstripe.org"
"name": "The SilverStripe Community",
"homepage": "http://silverstripe.org"
}
],
"require": {