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;

24
lib/App/Netdisco/Web/Search.pm
View File

@@ -15,24 +15,24 @@ hook 'before' => sub {
{ name => 'deviceports', label => 'Device Ports', default => 'on' },
]);
# view settings for port options
var('port_options' => [
{ name => 'ethernet', label => 'Ethernet Only', default => 'on' },
]);
# view settings for device options
var('device_options' => [
{ name => 'matchall', label => 'Match All Options', default => 'on' },
]);
return unless (request->path eq uri_for('/search')->path
or index(request->path, uri_for('/ajax/content/search')->path) == 0);
return unless param('firstsearch') and
(request->path eq uri_for('/search')->path
or index(request->path, uri_for('/ajax/content/search')->path) == 0);
foreach my $col (@{ var('node_options') }) {
next unless $col->{default} eq 'on';
params->{$col->{name}} = 'checked'
if not param('tab') or param('tab') ne 'node';
}
foreach my $col (@{ var('device_options') }) {
next unless $col->{default} eq 'on';
params->{$col->{name}} = 'checked'
if not param('tab') or param('tab') ne 'device';
foreach my $col (@{ var('node_options') },
@{ var('port_options') },
@{ var('device_options') }) {
params->{$col->{name}} = 'checked' if $col->{default} eq 'on';
}
};