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

fix bug in selection of Port Free state - was accidentally applying date filter to all ports rather than just those not up

Browse Source
This commit is contained in:
Oliver Gorwits
2014-08-17 23:41:50 +01:00
parent 141977f155
commit f62646bbe4
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,42 +97,28 @@ get '/ajax/content/device/ports' => require_login sub {
: ()
);
# user deseleted all port states. that means no ports.
return unless scalar keys %port_state;
if ( exists $port_state{free} ) {
my $age_num = ( param('age_num') || 3 );
my $age_unit = ( param('age_unit') || 'months' );
my $interval = "$age_num $age_unit";
if ( scalar keys %port_state == 1 ) {
$rs = $rs->search(
{ 'me.up' => { '!=' => 'up' }, },
{ where => \[
"age(now(), to_timestamp(extract(epoch from me.device_last_discover) "
. "- (me.device_uptime - me.lastchange)/100)) "
. "> ?::interval",
[ {} => $interval ]
]
}
);
}
else {
$rs = $rs->search(
{},
{ where => \[
"age(now(), to_timestamp(extract(epoch from me.device_last_discover) "
. "- (me.device_uptime - me.lastchange)/100)) "
. "> ?::interval",
[ {} => $interval ]
]
}
);
}
delete $port_state{free};
}
if ( scalar keys %port_state < 3 ) {
# if four keys, that's shorthand for everything.
# so only add these filters if user deselected something.
if (scalar keys %port_state != 4) {
my @combi = ();
if ( exists $port_state{free} ) {
my $age_num = ( param('age_num') || 3 );
my $age_unit = ( param('age_unit') || 'months' );
my $interval = "$age_num $age_unit";
push @combi, { -and => [
{ 'me.up_admin' => 'up', 'me.up' => { '!=' => 'up' } },
\[ "age(now(), to_timestamp(extract(epoch from me.device_last_discover) "
. "- (me.device_uptime - me.lastchange)/100)) "
. "> ?::interval",
[ {} => $interval ] ],
]};
}
push @combi, { 'me.up' => 'up' }
if exists $port_state{up};
push @combi, { 'me.up_admin' => 'up', 'me.up' => { '!=' => 'up' } }