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

remove an unecessary count()

Browse Source
This commit is contained in:
Oliver Gorwits
2012-02-13 23:13:19 +00:00
parent d4388bb519
commit c64b68c99c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,20 +83,18 @@ ajax '/ajax/content/device/ports' => sub {
if ($q) {
if ($q =~ m/^\d+$/) {
$set = $set->search_by_vlan({vlan => $q});
return unless $set->count;
}
else {
my $c = schema('netdisco')->resultset('DevicePort')
->search_by_ip({ip => $ip})
->search_by_port({port => $q});
if ($c->count) {
if ($set->search_by_port({port => $q})->count) {
$set = $set->search_by_port({port => $q});
}
else {
$set = $set->search_by_name({name => $q});
}
}
}
return unless $set->count;
}
}
}
# retrieve related data for additonal table columns, if asked for
$set = $set->search_rs({}, {prefetch => {nodes => 'ips'}})
@@ -106,10 +104,12 @@ ajax '/ajax/content/device/ports' => sub {
# if active or not, control the join to Node table
if (param('n_archived')) {
$set = $set->search_rs({-or => [{'nodes.active' => 1}, {'nodes.active' => 0}]});
$set = $set->search_rs({
-or => [{-bool => 'nodes.active'}, {-not_bool => 'nodes.active'}]
});
}
else {
$set = $set->search_rs({'nodes.active' => 1});
$set = $set->search_rs({-bool => 'nodes.active'});
}
# sort, and filter by free ports