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 table sorts not working

Browse Source 
Define sortable fields for all table controllers
This commit is contained in:
Tony Murray
2020-06-15 09:50:21 -05:00
parent 200a39a4b0
commit 853fbf632e
9 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,35 +114,35 @@ class FdbTablesController extends TableController
$sort = $request->get('sort');
if (isset($sort['mac_address'])) {
$query->orderBy('mac_address', $sort['mac_address']);
$query->orderBy('mac_address', $sort['mac_address'] == 'desc' ? 'desc' : 'asc');
}
if (isset($sort['device'])) {
$query->leftJoin('devices', 'ports_fdb.device_id', 'devices.device_id')
->orderBy('hostname', $sort['device']);
->orderBy('hostname', $sort['device'] == 'desc' ? 'desc' : 'asc');
}
if (isset($sort['vlan'])) {
$query->leftJoin('vlans', 'ports_fdb.vlan_id', 'vlans.vlan_id')
->orderBy('vlan_vlan', $sort['vlan']);
->orderBy('vlan_vlan', $sort['vlan'] == 'desc' ? 'desc' : 'asc');
}
if (isset($sort['interface'])) {
$query->leftJoin('ports', 'ports_fdb.port_id', 'ports.port_id')
->orderBy('ports.ifDescr', $sort['interface']);
->orderBy('ports.ifDescr', $sort['interface'] == 'desc' ? 'desc' : 'asc');
}
if (isset($sort['description'])) {
$query->leftJoin('ports', 'ports_fdb.port_id', 'ports.port_id')
->orderBy('ports.ifDescr', $sort['description']);
->orderBy('ports.ifDescr', $sort['description'] == 'desc' ? 'desc' : 'asc');
}
if (isset($sort['last_seen'])) {
$query->orderBy('updated_at', $sort['last_seen']);
$query->orderBy('updated_at', $sort['last_seen'] == 'desc' ? 'desc' : 'asc');
}
if (isset($sort['first_seen'])) {
$query->orderBy('created_at', $sort['first_seen']);
$query->orderBy('created_at', $sort['first_seen'] == 'desc' ? 'desc' : 'asc');
}
return $query;
@@ -163,7 +163,7 @@ class FdbTablesController extends TableController
'first_seen' => 'unknown',
'last_seen' => 'unknown'
];
// diffForHumans and doDateTimeString are not safe
if ($fdb_entry->updated_at) {
$item['last_seen'] = $fdb_entry->updated_at->diffForHumans();