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

modify module inventory csv due to datatables changes

Browse Source
This commit is contained in:
Eric A. Miller
2014-05-20 23:05:39 -04:00
parent 54e65cde30
commit 1919924441
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm
View File

@@ -109,7 +109,7 @@ get '/ajax/content/report/moduleinventory' => require_login sub {
else { else {
header( 'Content-Type' => 'text/comma-separated-values' ); header( 'Content-Type' => 'text/comma-separated-values' );
template 'ajax/report/moduleinventory_csv.tt', template 'ajax/report/moduleinventory_csv.tt',
{ results => $rs, opt => $has_opt }, { results => \@results, opt => $has_opt },
{ layout => undef }; { layout => undef };
} }
}; };

6
Netdisco/share/views/ajax/report/moduleinventory_csv.tt
View File

@@ -2,9 +2,9 @@
[% IF opt %] [% IF opt %]
[% CSV.dump(['Device' 'Description' 'Name' 'Class' 'Type' 'Model' 'Serial' 'HW Version' 'SW Version' 'FW Version']) %] [% CSV.dump(['Device' 'Description' 'Name' 'Class' 'Type' 'Model' 'Serial' 'HW Version' 'SW Version' 'FW Version']) %]
[% WHILE (row = results.next) %] [% FOREACH row IN results %]
[% mylist = [] %] [% mylist = [] %]
[% device = row.device.dns || row.device.name || row.device.ip %] [% device = row.device.dns || row.device.name || row.ip %]
[% FOREACH col IN [ device row.description row.name row.class.ucfirst row.type row.model row.serial row.hw_ver row.sw_ver row.fw_ver ] %] [% FOREACH col IN [ device row.description row.name row.class.ucfirst row.type row.model row.serial row.hw_ver row.sw_ver row.fw_ver ] %]
[% mylist.push(col) %] [% mylist.push(col) %]
[% END %] [% END %]
@@ -14,7 +14,7 @@
[% ELSE %] [% ELSE %]
[% CSV.dump(['Class' 'Count']) %] [% CSV.dump(['Class' 'Count']) %]
[% WHILE (row = results.next) %] [% FOREACH row IN results %]
[% mylist = [] %] [% mylist = [] %]
[% FOREACH col IN [ row.class.ucfirst row.count ] %] [% FOREACH col IN [ row.class.ucfirst row.count ] %]
[% mylist.push(col) %] [% mylist.push(col) %]