tonyair/silverstripe-dms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-dms synced 2024-06-27 06:59:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #184 from creative-commoners/pulls/2.0/bug-can-edit-permissions-fix

Browse Source 
FIX Removed duplicate permission check + removed SITETREEE_VIEW_ALL
This commit is contained in:
sachajudd 2017-06-29 17:44:26 +12:00 committed by GitHub
commit 9d117d6f49
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/model/DMSDocument.php
View File

@ -134,7 +134,7 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
} }
if ($this->CanViewType == 'OnlyTheseUsers' && $this->ViewerGroups()->count()) { if ($this->CanViewType == 'OnlyTheseUsers' && $this->ViewerGroups()->count()) {
return ($member && $member->inGroups($this->ViewerGroups())); return ($member && $member->inGroups($this->ViewerGroups()) || $this->canEdit($member));
} }
return $this->canEdit($member); return $this->canEdit($member);
@ -155,15 +155,7 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
} }
// Do early admin check // Do early admin check
if ($member && Permission::checkMember( if ($member && Permission::checkMember($member, array('ADMIN','SITETREE_EDIT_ALL'))) {
$member,
array(
'ADMIN',
'SITETREE_EDIT_ALL',
'SITETREE_VIEW_ALL',
)
)
) {
return true; return true;
} }
@ -175,7 +167,7 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
return $member && $member->inGroups($this->EditorGroups()); return $member && $member->inGroups($this->EditorGroups());
} }
return ($member && Permission::checkMember($member, array('ADMIN', 'SITETREE_EDIT_ALL'))); return false;
} }
/** /**