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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Changes
View File

@@ -1,3 +1,9 @@
2.027005 - 2014-05-15
[BUG FIXES]
* Improve VLAN Inventory performance and show all VLANs (C. Stromsoe)
2.027004 - 2014-05-15 2.027004 - 2014-05-15
[BUG FIXES] [BUG FIXES]

10
Netdisco/lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm
View File

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