From 3a5a64d5c17a0b19e7887fd7461ec35c824fc3c6 Mon Sep 17 00:00:00 2001 From: Mitt <10653144+MittWillson@users.noreply.github.com> Date: Sat, 9 Dec 2023 21:24:01 +0800 Subject: [PATCH] fix: device format missing display field (#15623) --- app/Http/Controllers/Select/ApplicationController.php | 2 +- app/Http/Controllers/Select/DeviceController.php | 4 ++-- app/Http/Controllers/Select/MuninPluginController.php | 2 +- app/Http/Controllers/Select/PortController.php | 2 +- app/Http/Controllers/Select/ServiceController.php | 2 +- app/Http/Controllers/Widgets/GraphController.php | 2 +- app/Http/Controllers/Widgets/TopDevicesController.php | 8 ++++---- app/Http/Controllers/Widgets/TopErrorsController.php | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Select/ApplicationController.php b/app/Http/Controllers/Select/ApplicationController.php index dd22ce2b1d..6f6ebf2298 100644 --- a/app/Http/Controllers/Select/ApplicationController.php +++ b/app/Http/Controllers/Select/ApplicationController.php @@ -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')) { diff --git a/app/Http/Controllers/Select/DeviceController.php b/app/Http/Controllers/Select/DeviceController.php index 3affe025d9..faf3f47aa4 100644 --- a/app/Http/Controllers/Select/DeviceController.php +++ b/app/Http/Controllers/Select/DeviceController.php @@ -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'); } diff --git a/app/Http/Controllers/Select/MuninPluginController.php b/app/Http/Controllers/Select/MuninPluginController.php index 6a48a2cb68..550c2baa61 100644 --- a/app/Http/Controllers/Select/MuninPluginController.php +++ b/app/Http/Controllers/Select/MuninPluginController.php @@ -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'); } diff --git a/app/Http/Controllers/Select/PortController.php b/app/Http/Controllers/Select/PortController.php index 2bbc4a2bfb..9c88524dcd 100644 --- a/app/Http/Controllers/Select/PortController.php +++ b/app/Http/Controllers/Select/PortController.php @@ -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']); diff --git a/app/Http/Controllers/Select/ServiceController.php b/app/Http/Controllers/Select/ServiceController.php index 6d1d55ff3f..b87c84203f 100644 --- a/app/Http/Controllers/Select/ServiceController.php +++ b/app/Http/Controllers/Select/ServiceController.php @@ -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'); } diff --git a/app/Http/Controllers/Widgets/GraphController.php b/app/Http/Controllers/Widgets/GraphController.php index 812c192bb8..4335b01a2c 100644 --- a/app/Http/Controllers/Widgets/GraphController.php +++ b/app/Http/Controllers/Widgets/GraphController.php @@ -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(); diff --git a/app/Http/Controllers/Widgets/TopDevicesController.php b/app/Http/Controllers/Widgets/TopDevicesController.php index af859a88b0..d3a2619949 100644 --- a/app/Http/Controllers/Widgets/TopDevicesController.php +++ b/app/Http/Controllers/Widgets/TopDevicesController.php @@ -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') diff --git a/app/Http/Controllers/Widgets/TopErrorsController.php b/app/Http/Controllers/Widgets/TopErrorsController.php index fd178820f0..ce46473ee8 100644 --- a/app/Http/Controllers/Widgets/TopErrorsController.php +++ b/app/Http/Controllers/Widgets/TopErrorsController.php @@ -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'])