Fixed #9

CHANGELOG-v3.md

@@ -17,6 +17,7 @@ Craft CMS 3.0 Working Changelog
 - Fixed some asterisk icons.
 - Fixed a bug where it was impossible to upload user photo, site logo or site icon.
 - #8: Fixed a bug where it was possible to select multiple default options for Dropdown and Radio Buttons fields.
+- #9: Fixed a bug where the “Globals” Control Panel nav item would link to a 404 right after deleting the first global set in Settings → Globals. 
 
 ## 3.0.0-beta.2 - 2017-02-02
 

src/config/cproutes/common.php

@@ -15,6 +15,7 @@
     'entries/<sectionHandle:{handle}>/<entryId:\d+><slug:(?:-{slug})?>/<siteHandle:{handle}>' => 'entries/edit-entry',
     'entries/<sectionHandle:{handle}>/<entryId:\d+><slug:(?:-{slug}?)?>/drafts/<draftId:\d+>' => 'entries/edit-entry',
     'entries/<sectionHandle:{handle}>/<entryId:\d+><slug:(?:-{slug})?>/versions/<versionId:\d+>' => 'entries/edit-entry',
+    'globals' => 'globals',
     'globals/<globalSetHandle:{handle}>' => 'globals/edit-content',
     'globals/<siteHandle:{handle}>/<globalSetHandle:{handle}>' => 'globals/edit-content',
     'updates' => 'update/index',

src/controllers/GlobalsController.php

@@ -28,6 +28,23 @@ class GlobalsController extends Controller
     // Public Methods
     // =========================================================================
 
+    /**
+     * Index
+     *
+     * @return Response
+     * @throws ForbiddenHttpException if the user isn't authorized to edit any global sets
+     */
+    public function actionIndex()
+    {
+        $editableSets = Craft::$app->getGlobals()->getEditableSets();
+
+        if (empty($editableSets)) {
+            throw new ForbiddenHttpException('User not permitted to edit any global content');
+        }
+
+        return $this->redirect('globals/'.$editableSets[0]->handle);
+    }
+
     /**
      * Saves a global set.
      *

src/web/twig/variables/Cp.php

@@ -58,12 +58,10 @@ public function nav(): array
             ];
         }
 
-        $globals = Craft::$app->getGlobals()->getEditableSets();
-
-        if (!empty($globals)) {
+        if (!empty(Craft::$app->getGlobals()->getEditableSets())) {
             $navItems[] = [
                 'label' => Craft::t('app', 'Globals'),
-                'url' => 'globals/'.$globals[0]->handle,
+                'url' => 'globals',
                 'icon' => 'globe'
             ];
         }