tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-03 22:58:24 +02:00
Code Issues Projects Releases Wiki Activity

API CHANGE: Added canDeleteFromLive permission to SiteTree, separate from canPublish (from r93315)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96756 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-01-12 23:36:01 +00:00
parent b10f8a908d
commit 92b4a32e5e
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/model/SiteTree.php
View File

@ -904,6 +904,15 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
return $this->canEdit($member);
}
public function canDeleteFromLive($member = null) {
// If we have a result, then that means at least one decorator specified canDeleteFromLive
// Allow the permission check only if *all* voting decorators allow it.
$results = $this->extend('canDeleteFromLive', $member);
if($results && is_array($results)) if(!min($results)) return false;
return $this->canPublish($member);
}
/**
* Stub method to get the site config, provided so it's easy to override
*/
@ -1916,7 +1925,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
* @uses SiteTreeDecorator->onAfterUnpublish()
*/
function doUnpublish() {
if (!$this->canPublish()) return false;
if (!$this->canDeleteFromLive()) return false;
$this->extend('onBeforeUnpublish');
@ -1991,6 +2000,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
Versioned::reading_stage($origStage);
$this->extend('onAfterUnpublish');
return true;
}
/**