From e7f88b2e2df8b15d9c77c3eced913e5ce3128127 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Mon, 13 May 2019 14:26:52 -0500 Subject: [PATCH] Fix device types and locations order (#10220) --- app/Http/ViewComposers/MenuComposer.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/ViewComposers/MenuComposer.php b/app/Http/ViewComposers/MenuComposer.php index bbd6caacca..af19cb72e5 100644 --- a/app/Http/ViewComposers/MenuComposer.php +++ b/app/Http/ViewComposers/MenuComposer.php @@ -60,13 +60,13 @@ class MenuComposer $vars['title_image'] = Config::get('title_image', "images/librenms_logo_$site_style.svg"); // Device menu - $vars['device_groups'] = DeviceGroup::hasAccess($user)->orderBy('name')->select('device_groups.id', 'name', 'desc')->get(); + $vars['device_groups'] = DeviceGroup::hasAccess($user)->orderBy('name')->get(['device_groups.id', 'name', 'desc']); $vars['package_count'] = Package::hasAccess($user)->count(); - $vars['device_types'] = Device::hasAccess($user)->select('type')->distinct()->get()->pluck('type')->filter(); + $vars['device_types'] = Device::hasAccess($user)->select('type')->distinct()->where('type', '!=', '')->orderBy('type')->pluck('type'); - $vars['locations'] = Config::get('show_locations') && Config::get('show_locations_dropdown') ? - Location::hasAccess($user)->where('location', '!=', '')->select('location', 'id')->get() : + $vars['locations'] = (Config::get('show_locations') && Config::get('show_locations_dropdown')) ? + Location::hasAccess($user)->where('location', '!=', '')->orderBy('location')->get(['location', 'id']) : collect(); // Service menu @@ -96,9 +96,9 @@ class MenuComposer // Wireless menu $wireless_menu_order = array_keys(\LibreNMS\Device\WirelessSensor::getTypes()); - $vars['wireless_menu'] = WirelessSensor::hasAccess($user)->select('sensor_class') + $vars['wireless_menu'] = WirelessSensor::hasAccess($user) ->groupBy('sensor_class') - ->get() + ->get(['sensor_class']) ->sortBy(function ($wireless_sensor) use ($wireless_menu_order) { $pos = array_search($wireless_sensor->sensor_class, $wireless_menu_order); return $pos === false ? 100 : $pos; // unknown at bottom