From e3af64df77613b98c5efde9d5e7381ab0f5de52d Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 6 Mar 2019 18:42:47 +0000 Subject: [PATCH 1/2] #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 }, From 249f05165fd25bdd43802a95c523f0486fc013de Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 6 Mar 2019 18:43:31 +0000 Subject: [PATCH 2/2] release 2.040007 --- META.json | 4 ++-- META.yml | 4 ++-- lib/App/Netdisco.pm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/META.json b/META.json index 5b18dc40..c19aca81 100644 --- a/META.json +++ b/META.json @@ -118,7 +118,7 @@ "provides" : { "App::Netdisco" : { "file" : "lib/App/Netdisco.pm", - "version" : "2.040006" + "version" : "2.040007" }, "App::Netdisco::AnyEvent::Nbtstat" : { "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm" @@ -800,6 +800,6 @@ "x_IRC" : "irc://irc.freenode.org/#netdisco", "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users" }, - "version" : "2.040006", + "version" : "2.040007", "x_serialization_backend" : "JSON::PP version 2.97001" } diff --git a/META.yml b/META.yml index a5071bc5..f7cb0c94 100644 --- a/META.yml +++ b/META.yml @@ -22,7 +22,7 @@ name: App-Netdisco provides: App::Netdisco: file: lib/App/Netdisco.pm - version: '2.040006' + version: '2.040007' App::Netdisco::AnyEvent::Nbtstat: file: lib/App/Netdisco/AnyEvent/Nbtstat.pm App::Netdisco::Backend::Job: @@ -549,5 +549,5 @@ resources: homepage: http://netdisco.org/ license: http://opensource.org/licenses/bsd-license.php repository: https://github.com/netdisco/netdisco -version: '2.040006' +version: '2.040007' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm index bca470bc..cecfe6ae 100644 --- a/lib/App/Netdisco.pm +++ b/lib/App/Netdisco.pm @@ -4,7 +4,7 @@ use strict; use warnings; use 5.010_000; -our $VERSION = '2.040006'; +our $VERSION = '2.040007'; use App::Netdisco::Configuration; =head1 NAME