From 813d40c084f948395f07b84f1250cc7bb6c0fd87 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Sat, 31 Dec 2016 12:17:50 -0600
Subject: [PATCH] forms: Fix "in the last n days" criteria
'twas a copy+paste hazard from when it was created.
---
include/class.forms.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/class.forms.php b/include/class.forms.php
index 8417f1a16..d33cccf27 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -2159,15 +2159,13 @@ class DatetimeField extends FormField {
$int = $intervals[$value['int'] ?: 'd'] ?: 'DAY';
$interval = new SqlInterval($int, $value['until']);
return new Q(array(
- "{$name}__lt" => $now,
- "{$name}__gte" => $now->minus($interval),
+ "{$name}__range" => array($now->minus($interval), $now),
));
case 'ndays':
$int = $intervals[$value['int'] ?: 'd'] ?: 'DAY';
$interval = new SqlInterval($int, $value['until']);
return new Q(array(
- "{$name}__gt" => $now,
- "{$name}__gte" => $now->plus($interval),
+ "{$name}__range" => array($now, $now->plus($interval)),
));
// Distant past and future ranges
case 'distpast':
--
GitLab