Make "Not" work for vlan number search in Device Ports
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
* 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
|
* [#58] Search by VLAN name now works
|
||||||
|
* Make "Not" option work for vlan number search in Device Ports
|
||||||
|
|
||||||
2.020002 - 2013-12-11
|
2.020002 - 2013-12-11
|
||||||
|
|
||||||
|
|||||||
@@ -21,12 +21,23 @@ get '/ajax/content/device/ports' => require_login sub {
|
|||||||
my $f = param('f');
|
my $f = param('f');
|
||||||
if ($f) {
|
if ($f) {
|
||||||
if ($f =~ m/^\d+$/) {
|
if ($f =~ m/^\d+$/) {
|
||||||
$set = $set->search({
|
if (param('invert')) {
|
||||||
-or => {
|
$set = $set->search({
|
||||||
'me.vlan' => $f,
|
'me.vlan' => { '!=' => $f },
|
||||||
'port_vlans_tagged.vlan' => $f,
|
'port_vlans_tagged.vlan' => [
|
||||||
},
|
'-or' => { '!=' => $f }, { '=' => undef }
|
||||||
}, { join => 'port_vlans_tagged' });
|
],
|
||||||
|
}, { join => 'port_vlans_tagged' });
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$set = $set->search({
|
||||||
|
-or => {
|
||||||
|
'me.vlan' => $f,
|
||||||
|
'port_vlans_tagged.vlan' => $f,
|
||||||
|
},
|
||||||
|
}, { join => 'port_vlans_tagged' });
|
||||||
|
}
|
||||||
|
|
||||||
return unless $set->count;
|
return unless $set->count;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
Reference in New Issue
Block a user