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

update Device.pm to use new helper naming

Browse Source
This commit is contained in:
Oliver Gorwits
2012-02-09 11:29:16 +00:00
parent d4c5e9fdac
commit 3ba4006c73
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ ajax '/ajax/content/device/ports' => sub {
my $ip = param('q');
return unless $ip;
my $set = schema('netdisco')->resultset('DevicePort')->by_ip($ip);
my $set = schema('netdisco')->resultset('DevicePort')->search_by_ip({ip => $ip});
# refine by ports if requested
my $q = param('f');
@@ -80,12 +80,13 @@ ajax '/ajax/content/device/ports' => sub {
$set = $set->by_vlan($q);
}
else {
my $c = schema('netdisco')->resultset('DevicePort')->by_ip($ip)->by_port($q);
my $c = schema('netdisco')->resultset('DevicePort')
->search_by_ip({ip => $ip})->search_by_port({port => $q});
if ($c->count) {
$set = $set->by_port($q);
$set = $set->search_by_port({port => $q});
}
else {
$set = $set->by_name($q);
$set = $set->search_by_name({name => $q});
}
}
}