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

API Apply SilverStripe\Security namespace (#35)

Browse Source
This commit is contained in:
Damian Mooyman 2016-07-07 13:43:27 +12:00 committed by Sam Minnée
parent c4cdeda7dc
commit 39b6d12969
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/Report.php
View File

@ -2,6 +2,8 @@
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\SS_List;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
/**
* Base "abstract" class creating reports on your data.
@ -514,6 +516,7 @@ abstract class SS_ReportWrapper extends SS_Report
public function group()
{
/** @skipUpgrade */
return $this->baseReport->hasMethod('group') ? $this->baseReport->group() : 'Group';
}

11
code/ReportAdmin.php
View File

@ -1,6 +1,9 @@
<?php
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\SS_List;
use SilverStripe\Security\Member;
use SilverStripe\Security\PermissionProvider;
/**
* Reports section of the CMS.
@ -52,8 +55,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
$this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
// Set custom options for TinyMCE specific to ReportAdmin
HtmlEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
HtmlEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
HTMLEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
HTMLEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
// Always block the HtmlEditorField.js otherwise it will be sent with an ajax request
Requirements::block(FRAMEWORK_DIR . '/javascript/HtmlEditorField.js');
@ -147,7 +150,9 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
/**
* Returns the link to the report admin section, or the specific report that is currently displayed
* @return String
*
* @param string $action
* @return string
*/
public function Link($action = null)
{