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

workaround for https://rt.cpan.org/Ticket/Display.html?id=93244

Browse Source
This commit is contained in:
Oliver Gorwits
2014-02-22 08:41:32 +00:00
parent 937661dd31
commit c1799a8a05
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -9,6 +9,7 @@
[ENHANCEMENTS]
* Kwalitee fixes
* workaround for https://rt.cpan.org/Ticket/Display.html?id=93244
2.023002 - 2014-02-17

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

@@ -372,8 +372,8 @@ sub carrying_vlan {
if ref {} ne ref $cond or !exists $cond->{vlan};
$cond->{'-and'} ||= [];
push @{$cond->{'-and'}}, 'vlans.vlan' => $cond->{vlan};
push @{$cond->{'-and'}}, 'port_vlans.vlan' => delete $cond->{vlan};
push @{$cond->{'-and'}}, { 'vlans.vlan' => $cond->{vlan} };
push @{$cond->{'-and'}}, { 'port_vlans.vlan' => delete $cond->{vlan} };
return $rs
->search_rs($cond,