135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device port search allows uplinks where remote is not discoverable

Browse Source
This commit is contained in:
Oliver Gorwits
2022-05-17 20:57:33 +01:00
parent 4d0e0cc613
commit f7204652a0
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/App/Netdisco/Web/Plugin/Search/Port.pm
View File

@@ -49,12 +49,15 @@ get '/ajax/content/search/port' => require_login sub {
->columns( [qw/ ip port name up up_admin speed /] )->search({ ->columns( [qw/ ip port name up up_admin speed /] )->search({
"port_vlans.vlan" => $q, "port_vlans.vlan" => $q,
( param('uplink') ? () : (-or => [ ( param('uplink') ? () : (-or => [
{-not_bool => "me.is_uplink"}, {-not_bool => "properties.remote_is_discoverable"},
{"me.is_uplink" => undef}, {-or => [
{-not_bool => "me.is_uplink"},
{"me.is_uplink" => undef},
]}
]) ), ]) ),
( param('ethernet') ? ("me.type" => 'ethernetCsmacd') : () ), ( param('ethernet') ? ("me.type" => 'ethernetCsmacd') : () ),
},{ '+columns' => [qw/ device.dns device.name port_vlans.vlan /], },{ '+columns' => [qw/ device.dns device.name port_vlans.vlan /],
join => [qw/ port_vlans device /] join => [qw/ properties port_vlans device /]
} }
)->with_times; )->with_times;
} }
@@ -83,14 +86,17 @@ get '/ajax/content/search/port' => require_login sub {
) : () ), ) : () ),
], ],
( param('uplink') ? () : (-or => [ ( param('uplink') ? () : (-or => [
{-not_bool => "me.is_uplink"}, {-not_bool => "properties.remote_is_discoverable"},
{"me.is_uplink" => undef}, {-or => [
{-not_bool => "me.is_uplink"},
{"me.is_uplink" => undef},
]}
]) ), ]) ),
( param('ethernet') ? ("me.type" => 'ethernetCsmacd') : () ), ( param('ethernet') ? ("me.type" => 'ethernetCsmacd') : () ),
] ]
}, },
{ '+columns' => [qw/ device.dns device.name port_vlans.vlan /], { '+columns' => [qw/ device.dns device.name port_vlans.vlan /],
join => [qw/ port_vlans device /] join => [qw/ properties port_vlans device /]
} }
)->with_times; )->with_times;
} }