From 55d088fdc0a7665693128a3ad3ea7252748eeccd Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 14 Jul 2016 14:47:58 +1200 Subject: [PATCH] Fix ReportAdmin::Link() not returning correct home url --- code/ReportAdmin.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php index f75efde3..ef4497b3 100644 --- a/code/ReportAdmin.php +++ b/code/ReportAdmin.php @@ -41,6 +41,9 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider */ protected $reportClass; + /** + * @var SS_Report + */ protected $reportObject; public function init() @@ -82,7 +85,6 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider return false; } - $hasViewableSubclasses = false; foreach ($this->Reports() as $report) { if ($report->canView($member)) { return true; @@ -157,11 +159,16 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider public function Link($action = null) { if ($this->reportObject) { - $link = $this->reportObject->getLink($action); - } else { - $link = self::join_links(parent::Link('index'), $action); + return $this->reportObject->getLink($action); } - return $link; + + // Join parent action + if($action) { + return static::join_links(parent::Link('index'), $action); + } + + // Basic link to this cms section + return parent::Link(); } public function providePermissions()