Eliminate an necessary database call in Module Inventory, Port SSID, and NetBIOS reports

2014-02-16 23:27:26 -05:00
parent 66c0a9d4fa
commit d1aa325bc7
9 changed files with 20 additions and 29 deletions
--- a/Netdisco/share/views/ajax/report/moduleinventory_csv.tt
+++ b/Netdisco/share/views/ajax/report/moduleinventory_csv.tt
@@ -1,6 +1,5 @@
 [% USE CSV -%]
-[% IF results.first.ip %]
-  [% row = results.reset %]
+[% IF opt %]
  [% CSV.dump(['Device' 'Description' 'Name' 'Class' 'Type' 'Model' 'Serial' 'HW Version' 'SW Version' 'FW Version']) %]

  [% WHILE (row = results.next) %]
@@ -13,7 +12,6 @@

  [% END %]
 [% ELSE %]
-  [% row = results.reset %]
  [% CSV.dump(['Class' 'Count']) %]

  [% WHILE (row = results.next) %]