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 format missing display field (#15623)

Browse Source
This commit is contained in:
Mitt
2023-12-09 21:24:01 +08:00
committed by GitHub
parent f6e7795ca1
commit 3a5a64d5c1
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Select/ApplicationController.php
View File

@@ -45,7 +45,7 @@ class ApplicationController extends SelectController
protected function baseQuery($request)
{
$query = Application::hasAccess($request->user())->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName');
$query->select('device_id', 'hostname', 'sysName', 'display');
}]);
if ($type = $request->get('type')) {

4
app/Http/Controllers/Select/DeviceController.php
View File

@@ -53,7 +53,7 @@ class DeviceController extends SelectController
// list devices the user does not have access to
if ($request->get('access') == 'inverted' && $user_id && $request->user()->isAdmin()) {
return Device::query()
->select('device_id', 'hostname', 'sysName')
->select('device_id', 'hostname', 'sysName', 'display')
->whereNotIn('device_id', function ($query) use ($user_id) {
$query->select('device_id')
->from('devices_perms')
@@ -63,7 +63,7 @@ class DeviceController extends SelectController
}
return Device::hasAccess($request->user())
->select('device_id', 'hostname', 'sysName')
->select('device_id', 'hostname', 'sysName', 'display')
->orderBy('hostname');
}

2
app/Http/Controllers/Select/MuninPluginController.php
View File

@@ -39,7 +39,7 @@ class MuninPluginController extends SelectController
{
return MuninPlugin::hasAccess($request->user())
->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName');
$query->select('device_id', 'hostname', 'sysName', 'display');
}])
->select('mplug_id', 'mplug_type', 'device_id');
}

2
app/Http/Controllers/Select/PortController.php
View File

@@ -65,7 +65,7 @@ class PortController extends SelectController
->isNotDeleted()
->has('device')
->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName');
$query->select('device_id', 'hostname', 'sysName', 'display');
}])
->select('ports.device_id', 'port_id', 'ifAlias', 'ifName', 'ifDescr')
->groupBy(['ports.device_id', 'port_id', 'ifAlias', 'ifName', 'ifDescr']);

2
app/Http/Controllers/Select/ServiceController.php
View File

@@ -39,7 +39,7 @@ class ServiceController extends SelectController
{
return Service::hasAccess($request->user())
->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName');
$query->select('device_id', 'hostname', 'sysName', 'display');
}])
->select('service_id', 'service_type', 'service_desc', 'device_id');
}

2
app/Http/Controllers/Widgets/GraphController.php
View File

@@ -148,7 +148,7 @@ class GraphController extends WidgetController
$data['graph_ports'] = Port::whereIntegerInRaw('port_id', $data['graph_ports'])
->select('ports.device_id', 'port_id', 'ifAlias', 'ifName', 'ifDescr')
->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName');
$query->select('device_id', 'hostname', 'sysName', 'display');
}])->get();
$data['graph_port_ids'] = $data['graph_ports']->pluck('port_id')->toJson();

8
app/Http/Controllers/Widgets/TopDevicesController.php
View File

@@ -130,7 +130,7 @@ class TopDevicesController extends WidgetController
/** @var Builder $query */
return $query->with(['device' => function ($query) {
return $query->select('device_id', 'hostname', 'sysName', 'status', 'os');
return $query->select('device_id', 'hostname', 'sysName', 'display', 'status', 'os');
}])
->select("$left_table.device_id")
->leftJoin('devices', "$left_table.device_id", 'devices.device_id')
@@ -151,7 +151,7 @@ class TopDevicesController extends WidgetController
{
$settings = $this->getSettings();
return Device::hasAccess(Auth::user())->select('device_id', 'hostname', 'sysName', 'status', 'os')
return Device::hasAccess(Auth::user())->select('device_id', 'hostname', 'sysName', 'display', 'status', 'os')
->where('devices.last_polled', '>', Carbon::now()->subMinutes($settings['time_interval']))
->when($settings['device_group'], function ($query) use ($settings) {
return $query->inDeviceGroup($settings['device_group']);
@@ -186,7 +186,7 @@ class TopDevicesController extends WidgetController
$settings = $this->getSettings();
$query = Port::hasAccess(Auth::user())->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName', 'status', 'os');
$query->select('device_id', 'hostname', 'sysName', 'display', 'status', 'os');
}])
->select('device_id')
->groupBy('device_id')
@@ -288,7 +288,7 @@ class TopDevicesController extends WidgetController
$settings = $this->getSettings();
$query = Storage::hasAccess(Auth::user())->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName', 'status', 'os');
$query->select('device_id', 'hostname', 'sysName', 'display', 'status', 'os');
}])
->leftJoin('devices', 'storage.device_id', 'devices.device_id')
->select('storage.device_id', 'storage_id', 'storage_descr', 'storage_perc', 'storage_perc_warn')

2
app/Http/Controllers/Widgets/TopErrorsController.php
View File

@@ -52,7 +52,7 @@ class TopErrorsController extends WidgetController
$data = $this->getSettings();
$query = Port::hasAccess($request->user())->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName', 'status', 'os');
$query->select('device_id', 'hostname', 'sysName', 'display', 'status', 'os');
}])
->isValid()
->select(['port_id', 'device_id', 'ifName', 'ifDescr', 'ifAlias'])