Adapt SubsiteXHRController to LeftAndMain API changes.

silverstripe · Jun 4, 2017 · 21a8c56 · 21a8c56
1 parent a4a1ab6
commit 21a8c56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/code/controller/SubsiteXHRController.php b/code/controller/SubsiteXHRController.php
@@ -13,6 +13,11 @@
  */
 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.

diff --git a/code/extensions/LeftAndMainSubsites.php b/code/extensions/LeftAndMainSubsites.php
@@ -15,6 +15,7 @@
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\Security;
+use SilverStripe\Subsites\Controller\SubsiteXHRController;
 use SilverStripe\Subsites\Model\Subsite;
 use SilverStripe\View\ArrayData;
 use SilverStripe\View\Requirements;
@@ -170,6 +171,11 @@ public function alternateMenuDisplayCheck($controllerName)
             return false;
         }
 
+        // Don't display SubsiteXHRController
+        if ($controllerName == SubsiteXHRController::class) {
+            return false;
+        }
+
         // Check subsite support.
         if (Subsite::currentSubsiteID() == 0) {
             // Main site always supports everything.