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

Adapt SubsiteXHRController to LeftAndMain API changes.

Browse Source
This commit is contained in:
Garion Herman 2017-06-04 14:30:51 +12:00
parent a4a1ab6a78
commit 21a8c56217
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/controller/SubsiteXHRController.php
View File

@ -13,6 +13,11 @@ use SilverStripe\Subsites\Model\Subsite;
*/ */
class SubsiteXHRController extends LeftAndMain class SubsiteXHRController extends LeftAndMain
{ {
/**
* @todo Temporary addition due to new requirements for LeftAndMain
* descendants in SS4. Consider alternate implementation.
*/
private static $url_segment = 'subsite_xhr';
/** /**
* Relax the access permissions, so anyone who has access to any CMS subsite can access this controller. * Relax the access permissions, so anyone who has access to any CMS subsite can access this controller.

6
code/extensions/LeftAndMainSubsites.php
View File

@ -15,6 +15,7 @@ use SilverStripe\ORM\DataObject;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Security\Permission; use SilverStripe\Security\Permission;
use SilverStripe\Security\Security; use SilverStripe\Security\Security;
use SilverStripe\Subsites\Controller\SubsiteXHRController;
use SilverStripe\Subsites\Model\Subsite; use SilverStripe\Subsites\Model\Subsite;
use SilverStripe\View\ArrayData; use SilverStripe\View\ArrayData;
use SilverStripe\View\Requirements; use SilverStripe\View\Requirements;
@ -170,6 +171,11 @@ class LeftAndMainSubsites extends Extension
return false; return false;
} }
// Don't display SubsiteXHRController
if ($controllerName == SubsiteXHRController::class) {
return false;
}
// Check subsite support. // Check subsite support.
if (Subsite::currentSubsiteID() == 0) { if (Subsite::currentSubsiteID() == 0) {
// Main site always supports everything. // Main site always supports everything.