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

initial location filtering

Browse Source
This commit is contained in:
Oliver Gorwits
2018-03-10 14:27:04 +00:00
parent ffc3f21533
commit 22e6e7a2d8
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/App/Netdisco/Web/Device.pm
View File

@@ -82,7 +82,8 @@ get '/device' => require_login sub {
params->{'tab'} ||= 'details';
template 'device', {
display_name => ($others ? $first->ip : ($first->dns || $first->ip)),
hgroup_list => setting('host_group_displaynames'),
location_list => [ schema('netdisco')->resultset('Device')->get_distinct_col('location') ],
hgroup_list => setting('host_group_displaynames'),
device => params->{'tab'},
};
};

4
lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
View File

@@ -122,8 +122,8 @@ ajax '/ajax/data/device/netmap' => require_login sub {
grep { defined } @{ $hgroup };
# list of locations selected by user and passed in param
my $locgrp = (ref [] eq ref param('locgrp') ? param('locgrp') : [param('locgrp')]);
my @lgrplist = List::MoreUtils::uniq grep { defined } @{ $locgrp };
my $lgroup = (ref [] eq ref param('lgroup') ? param('lgroup') : [param('lgroup')]);
my @lgrplist = List::MoreUtils::uniq grep { defined } @{ $lgroup };
my %ok_dev = ();
my %logvals = ();