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

fix for wrong col used in query

Browse Source
This commit is contained in:
Oliver Gorwits
2013-02-15 08:35:45 +00:00
parent 6efe52b3ae
commit e03b649b50
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -74,8 +74,8 @@ sub search_aliases {
else { else {
$q = "\%$q\%" if $q !~ m/\%/; $q = "\%$q\%" if $q !~ m/\%/;
$clause = [ $clause = [
'me.ip::text' => { '-ilike' => $q }, 'me.dns' => { '-ilike' => $q },
'device_ips.alias::text' => { '-ilike' => $q }, 'device_ips.dns' => { '-ilike' => $q },
]; ];
} }

9
Netdisco/lib/App/Netdisco/Web/Device.pm
View File

@@ -90,14 +90,13 @@ get '/device' => sub {
my $q = param('q'); my $q = param('q');
my $dev = schema('netdisco')->resultset('Device')->single({ my $dev = schema('netdisco')->resultset('Device')->single({
-or => [ -or => [
ip => $q, 'me.ip::text' => $q,
dns => $q, 'me.dns' => $q,
], ],
}); });
if (! $dev) { if (!defined $dev) {
redirect uri_for('/', {nosuchdevice => 1}); return redirect uri_for('/', {nosuchdevice => 1});
return;
} }
params->{'tab'} ||= 'details'; params->{'tab'} ||= 'details';