mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix device types and locations order (#10220)

Browse Source
This commit is contained in:
Tony Murray
2019-05-13 14:26:52 -05:00
committed by GitHub
parent de656dfb3b
commit e7f88b2e2d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/ViewComposers/MenuComposer.php
+6 -6
View File
@@ -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