diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm index a9701974..05b22af6 100644 --- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm +++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm @@ -16,17 +16,18 @@ register_report( get '/ajax/content/report/portutilization' => require_login sub { return unless schema('netdisco')->resultset('Device')->count; - my $set = schema('netdisco')->resultset('Virtual::PortUtilization'); + my @results = schema('netdisco')->resultset('Virtual::PortUtilization')->hri->all; if (request->is_ajax) { - template 'ajax/report/portutilization.tt', { results => $set, }, + my $results = to_json (\@results); + template 'ajax/report/portutilization.tt', { results => $results, }, { layout => undef }; } else { header( 'Content-Type' => 'text/comma-separated-values' ); - template 'ajax/report/portutilization_csv.tt', { results => $set, }, + template 'ajax/report/portutilization_csv.tt', { results => \@results, }, { layout => undef }; } }; -true; +1; diff --git a/Netdisco/share/views/ajax/report/portutilization.tt b/Netdisco/share/views/ajax/report/portutilization.tt index 42dbc896..5307ac6c 100644 --- a/Netdisco/share/views/ajax/report/portutilization.tt +++ b/Netdisco/share/views/ajax/report/portutilization.tt @@ -1,4 +1,4 @@ - +
@@ -8,16 +8,43 @@ - - [% WHILE (row = results.next) %] - - - - - - - - [% END %] -
DeviceFree
[% row.dns || row.ip | html_entity %][% row.port_count %][% row.ports_in_use %][% row.ports_shutdown %][% row.ports_free %]
+ + diff --git a/Netdisco/share/views/ajax/report/portutilization_csv.tt b/Netdisco/share/views/ajax/report/portutilization_csv.tt index 48f1fff7..c2c5b3ac 100644 --- a/Netdisco/share/views/ajax/report/portutilization_csv.tt +++ b/Netdisco/share/views/ajax/report/portutilization_csv.tt @@ -1,7 +1,7 @@ [% USE CSV -%] [% CSV.dump([ 'Device' 'Total Ports' 'In Use' 'Shutdown' 'Free' ]) %] -[% WHILE (row = results.next) %] +[% FOREACH row IN results %] [% mylist = [] %] [% device = row.dns || row.ip %] [% FOREACH col IN [ device row.port_count row.ports_in_use row.ports_shutdown row.ports_free ] %]