Improve VLAN Inventory performance and show all VLANs (C. Stromsoe)

This commit is contained in:
Oliver Gorwits
2014-05-19 20:59:17 +01:00
parent ee398fcae8
commit 62581f99e4
2 changed files with 11 additions and 5 deletions

View File

@@ -16,19 +16,19 @@ register_report(
get '/ajax/content/report/vlaninventory' => require_login sub {
my $set = schema('netdisco')->resultset('DeviceVlan')->search(
{ 'vlan.description' => { '!=', 'NULL' } },
{ 'me.description' => { '!=', 'NULL' } },
{ join => { 'ports' => 'vlan' },
select => [
'vlan.vlan',
'vlan.description',
'me.vlan',
'me.description',
{ count => { distinct => 'ports.ip' } },
{ count => 'ports.vlan' }
],
as => [qw/ vlan description dcount pcount /],
group_by => [qw/ vlan.vlan vlan.description /],
group_by => [qw/ me.vlan me.description /],
}
);
return unless $set->count;
return unless $set->has_rows;
if ( request->is_ajax ) {
template 'ajax/report/vlaninventory.tt', { results => $set, },