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

#388 searching for 0.x.x.x returns Internal Server Error (C. Neuhaus)

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-10 21:22:06 +01:00
parent 6ee946cca6
commit 11e49671fd
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/App/Netdisco/Web/Plugin/Search/Node.pm
View File

@@ -23,6 +23,7 @@ ajax '/ajax/content/search/node' => require_login sub {
my ( $start, $end ) = param('daterange') =~ m/(\d+-\d+-\d+)/gmx; my ( $start, $end ) = param('daterange') =~ m/(\d+-\d+-\d+)/gmx;
my $mac = NetAddr::MAC->new(mac => $node); my $mac = NetAddr::MAC->new(mac => $node);
undef $mac if ($mac and $mac->as_ieee and ($mac->as_ieee eq '00:00:00:00'));
my @active = (param('archived') ? () : (-bool => 'active')); my @active = (param('archived') ? () : (-bool => 'active'));
my (@times, @wifitimes, @porttimes); my (@times, @wifitimes, @porttimes);

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

@@ -39,6 +39,7 @@ get '/search' => require_login sub {
my $nd = $s->resultset('Device')->search_fuzzy($q); my $nd = $s->resultset('Device')->search_fuzzy($q);
my ($likeval, $likeclause) = sql_match($q); my ($likeval, $likeclause) = sql_match($q);
my $mac = NetAddr::MAC->new($q); my $mac = NetAddr::MAC->new($q);
undef $mac if ($mac and $mac->as_ieee and ($mac->as_ieee eq '00:00:00:00'));
if ($nd and $nd->count) { if ($nd and $nd->count) {
if ($nd->count == 1) { if ($nd->count == 1) {