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 pull request #29 from dhensby/pulls/3.2/fix-deps

Browse Source 
Decouple from CMS module
This commit is contained in:
Damian Mooyman 2016-03-22 17:41:09 +13:00
commit 7eb6b21494
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -9,7 +9,6 @@ php:
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- 7.0
env: env:
- DB=MYSQL CORE_RELEASE=3.2 - DB=MYSQL CORE_RELEASE=3.2
@ -20,8 +19,6 @@ matrix:
env: DB=MYSQL CORE_RELEASE=3 env: DB=MYSQL CORE_RELEASE=3
- php: 5.6 - php: 5.6
env: DB=PGSQL CORE_RELEASE=3.2 env: DB=PGSQL CORE_RELEASE=3.2
allow_failures:
- php: 7.0
before_script: before_script:
- composer self-update || true - composer self-update || true

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) ? Controller::join_links($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

@ -15,7 +15,7 @@
} }
], ],
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3,<7",
"silverstripe/framework": "~3.2" "silverstripe/framework": "~3.2"
}, },
"require-dev": { "require-dev": {