tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1538 from tractorcow/pulls/4.0/fix-canpublish

Browse Source 
BUG Restore SiteTree::canPublish method to resolve incorrect fallback…
This commit is contained in:
Daniel Hensby 2016-07-18 00:17:17 +01:00 committed by GitHub
commit 4861310834
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
code/model/SiteTree.php
View File

@ -905,6 +905,31 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
return false; return false;
} }
/**
* Check if this page can be published
*
* @param Member $member
* @return bool
*/
public function canPublish($member = null) {
if(!$member) {
$member = Member::currentUser();
}
// Check extension
$extended = $this->extendedCan('canPublish', $member);
if($extended !== null) {
return $extended;
}
if(Permission::checkMember($member, "ADMIN")) {
return true;
}
// Default to relying on edit permission
return $this->canEdit($member);
}
/** /**
* This function should return true if the current user can delete this page. It can be overloaded to customise the * This function should return true if the current user can delete this page. It can be overloaded to customise the
* security model for an application. * security model for an application.

55
tests/model/SiteTreeTest.php
View File

@ -1206,6 +1206,27 @@ class SiteTreeTest extends SapphireTest {
$this->assertFalse($page->canView()); $this->assertFalse($page->canView());
} }
public function testCanPublish() {
$page = new SiteTreeTest_ClassD();
Session::clear("loggedInAs");
// Test that false overrides any can_publish = true
SiteTreeTest_ExtensionA::$can_publish = true;
SiteTreeTest_ExtensionB::$can_publish = false;
$this->assertFalse($page->canPublish());
SiteTreeTest_ExtensionA::$can_publish = false;
SiteTreeTest_ExtensionB::$can_publish = true;
$this->assertFalse($page->canPublish());
// Test null extensions fall back to canEdit()
SiteTreeTest_ExtensionA::$can_publish = null;
SiteTreeTest_ExtensionB::$can_publish = null;
$page->canEditValue = true;
$this->assertTrue($page->canPublish());
$page->canEditValue = false;
$this->assertFalse($page->canPublish());
}
} }
/**#@+ /**#@+
@ -1258,6 +1279,20 @@ class SiteTreeTest_ClassC extends Page implements TestOnly {
class SiteTreeTest_ClassD extends Page implements TestOnly { class SiteTreeTest_ClassD extends Page implements TestOnly {
// Only allows this class, no children classes // Only allows this class, no children classes
private static $allowed_children = array('*SiteTreeTest_ClassC'); private static $allowed_children = array('*SiteTreeTest_ClassC');
private static $extensions = [
'SiteTreeTest_ExtensionA',
'SiteTreeTest_ExtensionB',
];
public $canEditValue = null;
public function canEdit($member = null)
{
return isset($this->canEditValue)
? $this->canEditValue
: parent::canEdit($member);
}
} }
class SiteTreeTest_ClassCext extends SiteTreeTest_ClassC implements TestOnly { class SiteTreeTest_ClassCext extends SiteTreeTest_ClassC implements TestOnly {
@ -1291,6 +1326,26 @@ class SiteTreeTest_AdminDenied extends Page implements TestOnly {
); );
} }
class SiteTreeTest_ExtensionA extends SiteTreeExtension implements TestOnly {
public static $can_publish = true;
public function canPublish($member)
{
return static::$can_publish;
}
}
class SiteTreeTest_ExtensionB extends SiteTreeExtension implements TestOnly {
public static $can_publish = true;
public function canPublish($member)
{
return static::$can_publish;
}
}
/** /**
* An extension that can even deny actions to admins * An extension that can even deny actions to admins