tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3'

This commit is contained in:
Daniel Hensby 2016-04-26 02:32:15 +01:00
parent 94faf34266 fe17073355
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: include:
- php: 5.6 - php: 5.6
env: DB=PGSQL CORE_RELEASE=master env: DB=PGSQL CORE_RELEASE=master
allow_failures:
- php: 7.0 - php: 7.0
env: DB=PGSQL CORE_RELEASE=master
before_script: before_script:
- composer self-update || true - composer self-update || true

5
code/SideReport.php
View File

@ -97,8 +97,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>";

8
composer.json
View File

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