From 34c0c4946cbbe17b291472c66cf018af8276b23c Mon Sep 17 00:00:00 2001 From: Raissa North Date: Thu, 1 Feb 2018 15:41:54 +1300 Subject: [PATCH] FIX Hide subsite operations when no subsites exist --- src/Extensions/SiteTreeSubsites.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php index de7b60e..4285a45 100644 --- a/src/Extensions/SiteTreeSubsites.php +++ b/src/Extensions/SiteTreeSubsites.php @@ -108,13 +108,13 @@ class SiteTreeSubsites extends DataExtension $subsitesMap = []; if ($subsites && $subsites->count()) { $subsitesToMap = $subsites->exclude('ID', $this->owner->SubsiteID); - $subsitesMap = $subsitesToMap->map('ID', 'Title')->toArray(); + $subsitesMap = $subsitesToMap->map('ID', 'Title'); } // Master page edit field (only allowed from default subsite to avoid inconsistent relationships) $isDefaultSubsite = $this->owner->SubsiteID == 0 || $this->owner->Subsite()->DefaultSite; - if ($isDefaultSubsite && $subsitesMap) { + if ($isDefaultSubsite && $subsitesMap->count()) { $fields->addFieldToTab( 'Root.Main', ToggleCompositeField::create( @@ -124,8 +124,7 @@ class SiteTreeSubsites extends DataExtension DropdownField::create('CopyToSubsiteID', _t( __CLASS__ . '.CopyToSubsite', 'Copy page to subsite' - ), $subsitesMap) - ->setEmptyString('Select an Option'), + ), $subsitesMap), CheckboxField::create( 'CopyToSubsiteWithChildren', _t(__CLASS__ . '.CopyToSubsiteWithChildren', 'Include children pages?')