From e3af64df77613b98c5efde9d5e7381ab0f5de52d Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 6 Mar 2019 18:42:47 +0000 Subject: [PATCH] #521-redux fix wifi date search --- Changes | 6 ++++++ lib/App/Netdisco/Web/Plugin/Search/Node.pm | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Changes b/Changes index f8a2cb73..4f29f214 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,9 @@ +2.040007 - 2019-03-06 + + [BUG FIXES] + + * #521-redux Search Node Date Range not working (ollyg) + 2.040006 - 2019-03-04 [BUG FIXES] diff --git a/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/lib/App/Netdisco/Web/Plugin/Search/Node.pm index 090802a5..6b74c86d 100644 --- a/lib/App/Netdisco/Web/Plugin/Search/Node.pm +++ b/lib/App/Netdisco/Web/Plugin/Search/Node.pm @@ -37,8 +37,8 @@ ajax '/ajax/content/search/node' => require_login sub { time_last => [ { '<', $start }, { '>', $end } ] ]); @wifitimes = (-or => [ - time_first => [ undef ], - time_last => [ { '<', $start }, { '>', $end } ] + time_last => [ undef ], + time_last => [ { '<', $start }, { '>', $end } ], ]); @porttimes = (-or => [ creation => [ undef ], @@ -57,10 +57,7 @@ ajax '/ajax/content/search/node' => require_login sub { ], ]); @wifitimes = (-or => [ - -and => [ - time_first => undef, - time_last => undef, - ], + time_last => undef, -and => [ time_last => { '>=', $start }, time_last => { '<=', $end },