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 3.4 into 3

Browse Source
This commit is contained in:
Damian Mooyman 2016-08-15 19:05:25 +12:00
commit 8f14b94433
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/ReportAdmin.php
View File

@ -34,10 +34,12 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
*/ */
protected $reportClass; protected $reportClass;
/**
* @var SS_Report
*/
protected $reportObject; protected $reportObject;
public function init() { public function init() {
parent::init();
//set the report we are currently viewing from the URL //set the report we are currently viewing from the URL
$this->reportClass = (isset($this->urlParams['ReportClass']) && $this->urlParams['ReportClass'] !== 'index') $this->reportClass = (isset($this->urlParams['ReportClass']) && $this->urlParams['ReportClass'] !== 'index')
@ -46,6 +48,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
$allReports = SS_Report::get_reports(); $allReports = SS_Report::get_reports();
$this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null; $this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
parent::init();
// Set custom options for TinyMCE specific to ReportAdmin // Set custom options for TinyMCE specific to ReportAdmin
HtmlEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css'); HtmlEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
HtmlEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang()); HtmlEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
@ -69,7 +73,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
if(!parent::canView($member)) return false; if(!parent::canView($member)) return false;
$hasViewableSubclasses = false; if ($this->reportObject) return $this->reportObject->canView($member);
foreach($this->Reports() as $report) { foreach($this->Reports() as $report) {
if($report->canView($member)) return true; if($report->canView($member)) return true;
} }