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

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

Browse Source
This commit is contained in:
Eric A. Miller
2014-02-16 23:27:26 -05:00
parent 66c0a9d4fa
commit d1aa325bc7
9 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,12 +96,14 @@ get '/ajax/content/report/moduleinventory' => require_login sub {
return unless $rs->has_rows;
if ( request->is_ajax ) {
template 'ajax/report/moduleinventory.tt', { results => $rs, },
template 'ajax/report/moduleinventory.tt',
{ results => $rs, opt => $has_opt },
{ layout => undef };
}
else {
header( 'Content-Type' => 'text/comma-separated-values' );
template 'ajax/report/moduleinventory_csv.tt', { results => $rs, },
template 'ajax/report/moduleinventory_csv.tt',
{ results => $rs, opt => $has_opt },
{ layout => undef };
}
};

14
Netdisco/lib/App/Netdisco/Web/Plugin/Report/Netbios.pm
View File

@@ -42,11 +42,10 @@ get '/ajax/content/report/netbios' => require_login sub {
if ( defined $domain ) {
$domain = '' if $domain eq 'blank';
$rs = $rs->search( { domain => $domain } )->order_by(
[ { -asc => 'domain' },
{ -desc => 'time_last' }
]
)->hri;
$rs
= $rs->search( { domain => $domain } )
->order_by( [ { -asc => 'domain' }, { -desc => 'time_last' } ] )
->hri;
}
else {
$rs = $rs->search(
@@ -62,12 +61,13 @@ get '/ajax/content/report/netbios' => require_login sub {
return unless $rs->has_rows;
if ( request->is_ajax ) {
template 'ajax/report/netbios.tt', { results => $rs, },
template 'ajax/report/netbios.tt', { results => $rs, opt => $domain },
{ layout => undef };
}
else {
header( 'Content-Type' => 'text/comma-separated-values' );
template 'ajax/report/netbios_csv.tt', { results => $rs, },
template 'ajax/report/netbios_csv.tt',
{ results => $rs, opt => $domain },
{ layout => undef };
}
};

5
Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm
View File

@@ -57,12 +57,13 @@ get '/ajax/content/report/portssid' => require_login sub {
return unless $rs->has_rows;
if ( request->is_ajax ) {
template 'ajax/report/portssid.tt', { results => $rs, },
template 'ajax/report/portssid.tt', { results => $rs, opt => $ssid },
{ layout => undef };
}
else {
header( 'Content-Type' => 'text/comma-separated-values' );
template 'ajax/report/portssid_csv.tt', { results => $rs, },
template 'ajax/report/portssid_csv.tt',
{ results => $rs, opt => $ssid },
{ layout => undef };
}
};