tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

API Changes for Authenticator refactor

This commit is contained in:
Simon Erkelens 2017-06-09 16:48:30 +12:00 committed by Damian Mooyman
parent 3f112ecfcd
commit 03125b8c6c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/Report.php
View File

@ -21,6 +21,7 @@ use SilverStripe\Forms\GridField\GridFieldDataColumns;
use SilverStripe\Forms\GridField\GridFieldPaginator;
use SilverStripe\Forms\GridField\GridField;
use SilverStripe\Core\Convert;
use SilverStripe\Security\Security;
use SilverStripe\View\ViewableData;
use ReflectionClass;
use SilverStripe\ORM\CMSPreviewable ;
@ -399,7 +400,7 @@ class Report extends ViewableData
public function canView($member = null)
{
if (!$member && $member !== false) {
$member = Member::currentUser();
$member = Security::getCurrentUser();
}
$extended = $this->extendedCan('canView', $member);

3
code/ReportAdmin.php
View File

@ -17,6 +17,7 @@ use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\SS_List;
use SilverStripe\Security\Member;
use SilverStripe\Security\PermissionProvider;
use SilverStripe\Security\Security;
use SilverStripe\View\ArrayData;
use SilverStripe\View\Requirements;
@ -80,7 +81,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
public function canView($member = null)
{
if (!$member && $member !== false) {
$member = Member::currentUser();
$member = Security::getCurrentUser();
}
if (!parent::canView($member)) {