Merge branch 'master' of https://github.com/netdisco/netdisco

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]

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"
 }

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'

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

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 },