Merge pull request #18069 from craftcms/bugfix/sites-menu

Don't show site selection menus when not necessary - part 2

Author: brandonkelly

src/helpers/Cp.php

@@ -3634,6 +3634,8 @@ public static function normalizeMenuItems(array $items): array
     /**
      * Returns a menu item array for the given sites, possibly grouping them by site group.
      *
+     * If only one site is meant to be shown, an empty array will be returned.
+     *
      * @param array<int,Site|array{site:Site,status?:string}> $sites
      * @param Site|null $selectedSite
      * @param array $config
@@ -3671,6 +3673,8 @@ public static function siteMenuItems(
         $params = $request->getQueryParamsWithoutPath();
         unset($params['fresh']);
 
+        $totalSites = 0;
+
         foreach ($siteGroups as $siteGroup) {
             $groupSites = $siteGroup->getSites();
             if (!$config['includeOmittedSites']) {
@@ -3681,6 +3685,8 @@ public static function siteMenuItems(
                 continue;
             }
 
+            $totalSites += count($groupSites);
+
             $groupSiteItems = array_map(fn(Site $site) => [
                 'status' => $sites[$site->id]['status'] ?? null,
                 'label' => Craft::t('site', $site->name),
@@ -3705,7 +3711,7 @@ public static function siteMenuItems(
             }
         }
 
-        return $items;
+        return $totalSites > 1 ? $items : [];
     }
 
     /**

src/templates/_layouts/elementindex.twig

@@ -30,7 +30,7 @@
         iconAltText: 'Site'|t('app'),
         label: selectedSite.name|t('site'),
         menu: {
-            items: siteMenuItems|length > 1 ? siteMenuItems : null,
+            items: siteMenuItems,
             label: 'Select site'|t('app')
         }
     }) %}

src/templates/globals/_edit.twig

@@ -10,7 +10,7 @@
         icon: 'world',
         label: requestedSite.name|t('site'),
         menu: {
-            items: siteMenuItems|length > 1 ? siteMenuItems : null,
+            items: siteMenuItems,
             label: 'Select site'|t('app')
         },
     }] %}

src/web/CpScreenResponseFormatter.php

@@ -151,7 +151,7 @@ private function _formatTemplate(YiiResponse $response, CpScreenResponseBehavior
                 'label' => Craft::t('site', $behavior->site->name),
                 'menu' => [
                     'label' => Craft::t('app', 'Select site'),
-                    'items' => count($siteMenuItems) > 1 ? $siteMenuItems : null,
+                    'items' => $siteMenuItems,
                 ],
             ]);
         }