diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm index 38af9706..b955f1b7 100644 --- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm +++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm @@ -24,18 +24,20 @@ get '/ajax/content/report/subnets' => require_login sub { $start = $tmp; } - my $set = schema('netdisco')->resultset('Virtual::SubnetUtilization') + my @results = schema('netdisco')->resultset('Virtual::SubnetUtilization') ->search(undef,{ bind => [ $subnet, $start, $end, $end, $subnet, $end, $end ], - }); + })->hri->all; + + return unless scalar @results; if ( request->is_ajax ) { - template 'ajax/report/subnets.tt', { results => $set }, + template 'ajax/report/subnets.tt', { results => \@results }, { layout => undef }; } else { header( 'Content-Type' => 'text/comma-separated-values' ); - template 'ajax/report/subnets_csv.tt', { results => $set }, + template 'ajax/report/subnets_csv.tt', { results => \@results }, { layout => undef }; } }; diff --git a/Netdisco/share/views/ajax/report/subnets.tt b/Netdisco/share/views/ajax/report/subnets.tt index 2b23238b..f369c598 100644 --- a/Netdisco/share/views/ajax/report/subnets.tt +++ b/Netdisco/share/views/ajax/report/subnets.tt @@ -1,6 +1,3 @@ -[% IF NOT results.has_rows %] -
No matching records.
-[% ELSE %] @@ -11,7 +8,7 @@ - [% FOREACH row IN results.all %] + [% FOREACH row IN results %] @@ -22,5 +19,3 @@ [% END %]
[% row.subnet | html_entity %]
-[% END %] - diff --git a/Netdisco/share/views/ajax/report/subnets_csv.tt b/Netdisco/share/views/ajax/report/subnets_csv.tt index 39bd9b57..14815c5c 100644 --- a/Netdisco/share/views/ajax/report/subnets_csv.tt +++ b/Netdisco/share/views/ajax/report/subnets_csv.tt @@ -1,7 +1,7 @@ [% USE CSV %] [% CSV.dump([ 'Subnet' 'Size' 'Number of Active Nodes' 'Percent Utilization' ]) %] -[% FOREACH row IN results.all %] +[% FOREACH row IN results %] [% mylist = [] %] [% mylist.push(row.subnet) %] [% mylist.push(row.subnet_size) %]