#521-redux fix wifi date search

2019-03-06 18:42:47 +00:00
parent 48857ae300
commit e3af64df77
2 changed files with 9 additions and 6 deletions
--- a/6
+++ b/6
@@ -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]
--- 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 },