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

Search by VLAN name now works

Browse Source
This commit is contained in:
Oliver Gorwits
2013-12-27 22:07:22 +00:00
parent c9f0f21577
commit 9dbcc1f4a3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -21,6 +21,7 @@
* Fix form reset icon on ports tab when using custom path (Daniel Tuecks) * Fix form reset icon on ports tab when using custom path (Daniel Tuecks)
* Don't store failed SNMP community in the database * Don't store failed SNMP community in the database
* [#51] Support DBD::Pg default for "host" field as local socket * [#51] Support DBD::Pg default for "host" field as local socket
* [#58] Search by VLAN name now works
2.020002 - 2013-12-11 2.020002 - 2013-12-11

7
Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -352,8 +352,9 @@ sub carrying_vlan {
die "vlan number required for carrying_vlan\n" die "vlan number required for carrying_vlan\n"
if ref {} ne ref $cond or !exists $cond->{vlan}; if ref {} ne ref $cond or !exists $cond->{vlan};
$cond->{'vlans.vlan'} = $cond->{vlan}; $cond->{'-and'} ||= [];
$cond->{'port_vlans.vlan'} = delete $cond->{vlan}; push @{$cond->{'-and'}}, 'vlans.vlan' => $cond->{vlan};
push @{$cond->{'-and'}}, 'port_vlans.vlan' => delete $cond->{vlan};
return $rs return $rs
->search_rs($cond, ->search_rs($cond,
@@ -402,7 +403,7 @@ sub carrying_vlan_name {
die "vlan name required for carrying_vlan_name\n" die "vlan name required for carrying_vlan_name\n"
if ref {} ne ref $cond or !exists $cond->{name}; if ref {} ne ref $cond or !exists $cond->{name};
$cond->{'vlans.description'} = { '-ilike' => $cond->{name} }; $cond->{'vlans.description'} = { '-ilike' => delete $cond->{name} };
return $rs return $rs
->search_rs({}, { ->search_rs({}, {