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

better port search from titlebar, option for ethernet ports

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-08 23:01:57 +00:00
parent fe7412e19a
commit f09442f63d
6 changed files with 96 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,33 +18,48 @@ get '/ajax/content/search/port' => require_login sub {
if ( $q =~ m/^\d+$/ ) {
$rs
= schema('netdisco')->resultset('DevicePort')
->columns( [qw/ ip port name descr /] )->search(
{ "port_vlans.vlan" => $q },
{ '+columns' => [qw/ device.dns device.name port_vlans.vlan /],
->columns( [qw/ ip port name up up_admin speed /] )->search({
"port_vlans.vlan" => $q,
( param('uplink') ? () : (-or => [
{-not_bool => "me.is_uplink"},
{"me.is_uplink" => undef},
]) ),
( param('ethernet') ? ("me.type" => 'ethernetCsmacd') : () ),
},{ '+columns' => [qw/ device.dns device.name port_vlans.vlan /],
join => [qw/ port_vlans device /]
}
);
)->with_times;
}
else {
my ( $likeval, $likeclause ) = sql_match($q);
$rs
= schema('netdisco')->resultset('DevicePort')
->columns( [qw/ ip port name descr /] )->search(
{ -or => [
{ "me.name" => ( param('partial') ? $likeclause : $q ) },
( length $q == 17
? { "me.mac" => $q }
: \[ 'me.mac::text ILIKE ?', $likeval ]
),
->columns( [qw/ ip port name up up_admin speed /] )
->search({
-and => [
-or => [
{ "me.name" => ( param('partial') ? $likeclause : $q ) },
( length $q == 17
? { "me.mac" => $q }
: \[ 'me.mac::text ILIKE ?', $likeval ]
),
( param('uplink') ? (
{ "me.remote_id" => $likeclause },
{ "me.remote_type" => $likeclause },
]
) : () ),
],
( param('uplink') ? () : (-or => [
{-not_bool => "me.is_uplink"},
{"me.is_uplink" => undef},
]) ),
( param('ethernet') ? ("me.type" => 'ethernetCsmacd') : () ),
]
},
{ '+columns' => [qw/ device.dns device.name port_vlans.vlan /],
join => [qw/ port_vlans device /]
}
);
)->with_times;
}
my @results = $rs->hri->all;