From e2eead88887eefd7d97986eeb410ecfeee1a0d20 Mon Sep 17 00:00:00 2001 From: Franco Springveldt Date: Thu, 29 Jun 2017 15:50:11 +1200 Subject: [PATCH] FIX Removed duplicate permission check + SITETREEE_VIEW_ALL permission from DMSDocument::canEdit --- code/model/DMSDocument.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/code/model/DMSDocument.php b/code/model/DMSDocument.php index b94b7b0..a4ba0ca 100644 --- a/code/model/DMSDocument.php +++ b/code/model/DMSDocument.php @@ -134,7 +134,7 @@ class DMSDocument extends DataObject implements DMSDocumentInterface } 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); @@ -155,15 +155,7 @@ class DMSDocument extends DataObject implements DMSDocumentInterface } // Do early admin check - if ($member && Permission::checkMember( - $member, - array( - 'ADMIN', - 'SITETREE_EDIT_ALL', - 'SITETREE_VIEW_ALL', - ) - ) - ) { + if ($member && Permission::checkMember($member, array('ADMIN','SITETREE_EDIT_ALL'))) { return true; } @@ -175,7 +167,7 @@ class DMSDocument extends DataObject implements DMSDocumentInterface return $member && $member->inGroups($this->EditorGroups()); } - return ($member && Permission::checkMember($member, array('ADMIN', 'SITETREE_EDIT_ALL'))); + return false; } /**