mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merge pull request #29 from dhensby/pulls/3.2/fix-deps
Decouple from CMS module
This commit is contained in:
commit
7eb6b21494
@ -9,7 +9,6 @@ php:
|
||||
- 5.4
|
||||
- 5.5
|
||||
- 5.6
|
||||
- 7.0
|
||||
|
||||
env:
|
||||
- DB=MYSQL CORE_RELEASE=3.2
|
||||
@ -20,8 +19,6 @@ matrix:
|
||||
env: DB=MYSQL CORE_RELEASE=3
|
||||
- php: 5.6
|
||||
env: DB=PGSQL CORE_RELEASE=3.2
|
||||
allow_failures:
|
||||
- php: 7.0
|
||||
|
||||
before_script:
|
||||
- composer self-update || true
|
||||
|
@ -88,8 +88,9 @@ class SideReportView extends ViewableData {
|
||||
}
|
||||
|
||||
if(isset($info['link']) && $info['link']) {
|
||||
$linkBase = singleton('CMSPageEditController')->Link('show');
|
||||
$link = ($info['link'] === true) ? Controller::join_links($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>";
|
||||
|
@ -15,7 +15,7 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"php": ">=5.3.3",
|
||||
"php": ">=5.3.3,<7",
|
||||
"silverstripe/framework": "~3.2"
|
||||
},
|
||||
"require-dev": {
|
||||
|
Loading…
Reference in New Issue
Block a user