tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-18 10:41:39 +02:00
Code Issues Projects Releases Wiki Activity

fixing doArchive

Browse Source 
for users who can delete, but not unpublish, they should be able to delete draft pages that they’ve created.

Old code used to unpublish even if the page wasn’t published, which meant users who couldn’t publish, also could delete draft pages. They could create draft pages, but not delete them.
This commit is contained in:
John Milmine 2017-04-27 08:48:19 +12:00
parent 48a3152ee2
commit 1ff6f3f1b0
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/model/SiteTree.php
View File

@ -2541,21 +2541,27 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
}
/**
* Removes the page from both live and stage
* Removes the page from both live and stage, if it exists on both
* otherwise just removes from stage
*
* @return bool Success
*/
public function doArchive() {
$this->invokeWithExtensions('onBeforeArchive', $this);
$doDelete = false;
if($this->doUnpublish()) {
$this->delete();
$this->invokeWithExtensions('onAfterArchive', $this);
return true;
if($this->ExistsOnLive) {
$doDelete = $this->doUnpublish();
} else {
$doDelete = true;
}
return false;
if ($doDelete) {
$this->delete();
$this->invokeWithExtensions('onAfterArchive', $this);
}
return $doDelete;
}
/**