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

STP - various fixes (#13773)

Browse Source 
* Filter fix
* Add link to device for bridge address and designated root if available
This commit is contained in:
PipoCanaja
2022-02-13 19:04:12 +01:00
committed by GitHub
parent 3fb4233c05
commit 3ac0de16b2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Device/Tabs/StpController.php
View File

@@ -71,7 +71,7 @@ class StpController implements DeviceTab
'vlan' => $active_vlan,
'device_id' => $device->device_id,
'stpInstances' => $stpInstances->filter(function ($instance) use ($active_vlan) {
return $active_vlan == 1 && $instance->vlan !== null || $instance->vlan !== $active_vlan;
return $active_vlan == 1 && $instance->vlan !== null || $instance->vlan == $active_vlan;
}),
'stpPorts' => $device->stpPorts()->where('vlan', $active_vlan)->when($active_vlan == 1, function ($query) {
return $query->orWhereNull('vlan');

8
resources/views/device/tabs/stp.blade.php
View File

@@ -15,7 +15,9 @@
<td>{{ trans('stp.bridge_address') }}</td>
<td>
{{ \LibreNMS\Util\Rewrite::readableMac($instance['bridgeAddress']) }}
@if($brVendor = \LibreNMS\Util\Rewrite::readableOUI($instance['bridgeAddress']))
@if($url = \LibreNMS\Util\Url::deviceLink(\App\Facades\DeviceCache::get(\App\Models\Stp::where('bridgeAddress', $instance['bridgeAddress'])->value('device_id'))))
({!! $url !!})
@elseif($brVendor = \LibreNMS\Util\Rewrite::readableOUI($instance['bridgeAddress']))
({{ $brVendor }})
@endif
</td>
@@ -40,7 +42,9 @@
<td>{{ trans('stp.designated_root') }}</td>
<td>
{{ \LibreNMS\Util\Rewrite::readableMac($instance['designatedRoot']) }}
@if($drVendor = \LibreNMS\Util\Rewrite::readableOUI($instance['designatedRoot']))
@if($url = \LibreNMS\Util\Url::deviceLink(\App\Facades\DeviceCache::get(\App\Models\Stp::where('bridgeAddress', $instance['designatedRoot'])->value('device_id'))))
({!! $url !!})
@elseif($drVendor = \LibreNMS\Util\Rewrite::readableOUI($instance['designatedRoot']))
({{ $drVendor }})
@endif
</td>