Fix to make open menu items active

Broken accidentally by previous PR lonnieezell#336
dgvirtual · May 14, 2023 · 46a6c44 · 46a6c44
1 parent 7de4a16
commit 46a6c44
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Menus/MenuItem.php b/src/Menus/MenuItem.php
@@ -120,7 +120,7 @@ public function setUrl(string $url)
      */
     public function setNamedRoute(string $name)
     {
-        $this->url = url_to($name);
+        $this->url = route_to($name);
 
         return $this;
     }

diff --git a/tests/Menus/MenuItemTest.php b/tests/Menus/MenuItemTest.php
@@ -91,7 +91,7 @@ public function testWithNamedRoutes()
         $item = new MenuItem();
         $item->setNamedRoute('home');
 
-        $this->assertSame(site_url('/home-sweet-home'), $item->url());
+        $this->assertSame('/home-sweet-home', $item->url());
     }
 
     public function testPropertyGetter()

diff --git a/themes/Admin/Components/sidebar.php b/themes/Admin/Components/sidebar.php
@@ -40,7 +40,7 @@
                 <?php foreach ($collection->items() as $item) : ?>
                     <?php if ($item->userCanSee()): ?>
                         <li class="nav-item">
-                            <a class="nav-link <?= url_is($item->url . '*') ? 'active' : '' ?>" href="<?= $item->url ?>">
+                            <a class="nav-link <?= url_is($item->url . '*') ? 'active' : '' ?>" href="<?= site_url($item->url) ?>">
                                 <?php if (! $collection->isCollapsible()) : ?>
                                     <?= $item->icon ?>
                                 <?php endif ?>