Fix device location menu links (#10214)

This commit is contained in:
Tony Murray
2019-05-13 09:45:54 -05:00
committed by GitHub
parent 882818d9f3
commit 32e5ef15e9
2 changed files with 2 additions and 2 deletions

View File

@@ -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

View File

@@ -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>