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

Add device group filter to widgets (#9692)

Browse Source
This commit is contained in:
Jellyfrog
2019-08-08 02:59:14 +02:00
committed by Tony Murray
parent b8c96abc35
commit fc281ccc4b
35 changed files with 262 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/Table/SyslogController.php
View File

@@ -34,6 +34,7 @@ class SyslogController extends TableController
{
return [
'device' => 'nullable|int',
'device_group' => 'nullable|int',
'program' => 'nullable|string',
'priority' => 'nullable|string',
'to' => 'nullable|date',
@@ -64,17 +65,17 @@ class SyslogController extends TableController
public function baseQuery($request)
{
/** @var Builder $query */
$query = Syslog::hasAccess($request->user())->with('device');
if ($from = $request->get('from')) {
$query->where('timestamp', '>=', $from);
}
if ($to = $request->get('to')) {
$query->where('timestamp', '<=', $to);
}
return $query;
return Syslog::hasAccess($request->user())
->with('device')
->when($request->device_group, function ($query) use ($request) {
$query->inDeviceGroup($request->device_group);
})
->when($request->from, function ($query) use ($request) {
$query->where('timestamp', '>=', $request->from);
})
->when($request->to, function ($query) use ($request) {
$query->where('timestamp', '<=', $request->to);
});
}
public function formatItem($syslog)