tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 09:05:55 +00:00
Code Issues Projects Releases Wiki Activity

FIX Do no provide input for canEdit or canPublish if no subsites exist

Browse Source
This commit is contained in:
Robbie Averill 2018-06-19 15:43:09 +12:00
parent 875f5519ed
commit dc9d6de62d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Extensions/SiteTreeSubsites.php
View File

@ -273,8 +273,10 @@ class SiteTreeSubsites extends DataExtension
* - Is in a group which has access to the subsite this page belongs to * - Is in a group which has access to the subsite this page belongs to
* - Is in a group with edit permissions on the "main site" * - Is in a group with edit permissions on the "main site"
* *
* @param null $member * If there are no subsites configured yet, this logic is skipped.
* @return bool *
* @param Member|null $member
* @return bool|null
*/ */
public function canEdit($member = null) public function canEdit($member = null)
{ {
@ -282,6 +284,11 @@ class SiteTreeSubsites extends DataExtension
$member = Security::getCurrentUser(); $member = Security::getCurrentUser();
} }
// Do not provide any input if there are no subsites configured
if (!Subsite::get()->count()) {
return null;
}
// Find the sites that this user has access to // Find the sites that this user has access to
$goodSites = Subsite::accessible_sites('CMS_ACCESS_CMSMain', true, 'all', $member)->column('ID'); $goodSites = Subsite::accessible_sites('CMS_ACCESS_CMSMain', true, 'all', $member)->column('ID');
@ -329,8 +336,8 @@ class SiteTreeSubsites extends DataExtension
} }
/** /**
* @param null $member * @param Member|null $member
* @return bool * @return bool|null
*/ */
public function canPublish($member = null) public function canPublish($member = null)
{ {