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

Protocol filter for Routing Table View (#10933)

Browse Source 
* Protocol filter for Routing Table View
* change protocol selector to listbox
* fix for issue with orWhere in RouteTablesController search
* renaming function updateTable()
This commit is contained in:
SourceDoctor
2019-12-15 22:50:28 +01:00
committed by PipoCanaja
parent 5bf56db50a
commit e98dd35a9b
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Table/RoutesTablesController.php
View File

@@ -71,10 +71,17 @@ class RoutesTablesController extends TableController
$query->on('ports.port_id', 'route.port_id');
};
$showAllRoutes = trim(\Request::get('showAllRoutes'));
$showProtocols = trim(\Request::get('showProtocols'));
if ($showProtocols == 'all') {
$protocols = array('ipv4', 'ipv6');
} else {
$protocols = array($showProtocols);
}
if ($request->device_id && $showAllRoutes == 'false') {
$query=Route::hasAccess($request->user())
->leftJoin('ports', $join)
->where('route.device_id', $request->device_id)
->whereIn('route.inetCidrRouteDestType', $protocols)
->where('updated_at', Route::hasAccess($request->user())
->where('route.device_id', $request->device_id)
->select('updated_at')
@@ -84,7 +91,8 @@ class RoutesTablesController extends TableController
if ($request->device_id && $showAllRoutes == 'true') {
$query=Route::hasAccess($request->user())
->leftJoin('ports', $join)
->where('route.device_id', $request->device_id);
->where('route.device_id', $request->device_id)
->whereIn('route.inetCidrRouteDestType', $protocols);
return $query;
}
return Route::hasAccess($request->user())
@@ -101,8 +109,10 @@ class RoutesTablesController extends TableController
{
if ($search = trim(\Request::get('searchPhrase'))) {
$searchLike = '%' . $search . '%';
return $query->where('route.inetCidrRouteNextHop', 'like', $searchLike)
->orWhere('route.inetCidrRouteDest', 'like', $searchLike);
return $query->where(function ($query) use ($searchLike) {
return $query->where('route.inetCidrRouteNextHop', 'like', $searchLike)
->orWhere('route.inetCidrRouteDest', 'like', $searchLike);
});
}
return $query;
}