From 32e5ef15e99084e51dc2dacfe862481ad7112638 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 13 May 2019 09:45:54 -0500
Subject: [PATCH] Fix device location menu links (#10214)

---
 app/Http/ViewComposers/MenuComposer.php | 2 +-
 resources/views/layouts/menu.blade.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/ViewComposers/MenuComposer.php b/app/Http/ViewComposers/MenuComposer.php
index 537acd8db6..27729b2fb5 100644
--- a/app/Http/ViewComposers/MenuComposer.php
+++ b/app/Http/ViewComposers/MenuComposer.php
@@ -66,7 +66,7 @@ class MenuComposer
         $vars['device_types'] = Device::hasAccess($user)->select('type')->distinct()->get()->pluck('type')->filter();
 
         $vars['locations'] = Config::get('show_locations') && Config::get('show_locations_dropdown') ?
-            Location::hasAccess($user)->select('location')->get()->map->display()->filter() :
+            Location::hasAccess($user)->where('location', '!=', '')->select('location', 'id')->get() :
             collect();
 
         // Service menu
diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php
index ed2641fddb..68afcff9d8 100644
--- a/resources/views/layouts/menu.blade.php
+++ b/resources/views/layouts/menu.blade.php
@@ -122,7 +122,7 @@
                             <ul class="dropdown-menu scrollable-menu">
                                 <li><a href="{{ url('locations') }}"><i class="fa fa-map-marker fa-fw fa-lg" aria-hidden="true"></i> @lang('All Locations')</a></li>
                             @foreach($locations as $location)
-                                    <li><a href="{{ url("devices/location=" . urlencode($location)) }}"><i class="fa fa-building fa-fw fa-lg" aria-hidden="true"></i> {{ $location }}</a></li>
+                                    <li><a href="{{ url("devices/location=" . $location->id) }}"><i class="fa fa-building fa-fw fa-lg" aria-hidden="true"></i> {{ $location->display() }}</a></li>
                             @endforeach
                             </ul>
                         </li>