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

always get vlans if column is enabled

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-11 09:56:36 +00:00
parent 862f2ba5b1
commit b0e8c7413d
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
View File

@@ -111,13 +111,9 @@ get '/ajax/content/device/ports' => require_login sub {
# make sure query asks for formatted timestamps when needed # make sure query asks for formatted timestamps when needed
$set = $set->with_times if param('c_lastchange'); $set = $set->with_times if param('c_lastchange');
# get number of vlans on the port to control whether to list them or not # get vlans on the port
$set = $set->with_vlan_count if param('c_vmember'); $set = $set->search_rs({}, { prefetch => 'all_port_vlans' })->with_vlan_count
if param('c_vmember');
# run single collapsed query for all relations, but only if we're not
# also fetching archived data (tests show it's better this way)
$set = $set->search_rs({}, { prefetch => 'all_port_vlans' })
if param('c_vmember') and not (param('c_nodes') and param('n_archived'));
# what kind of nodes are we interested in? # what kind of nodes are we interested in?
my $nodes_name = (param('n_archived') ? 'nodes' : 'active_nodes'); my $nodes_name = (param('n_archived') ? 'nodes' : 'active_nodes');