]> git.ipfire.org Git - thirdparty/bugzilla.git/commitdiff
Bug 283609 - Search for relative dates in deadline
authorghendricks%novell.com <>
Mon, 9 Nov 2009 20:54:50 +0000 (20:54 +0000)
committerghendricks%novell.com <>
Mon, 9 Nov 2009 20:54:50 +0000 (20:54 +0000)
patch by ghendricks@novell.com r=LpSolit, a=LpSolit

Bugzilla/Search.pm
template/en/default/search/form.html.tmpl

index fa18a0e787032792f17a61edb9506f4771d67ef4..4aaf7e14c2385cf4f2997b7a4944fa6b95f52d3d 100644 (file)
@@ -533,10 +533,8 @@ sub init {
       my $deadlineto;
             
       if ($params->param('deadlinefrom')){
-        $deadlinefrom = $params->param('deadlinefrom');
-        validate_date($deadlinefrom)
-          || ThrowUserError('illegal_date', {date => $deadlinefrom,
-                                             format => 'YYYY-MM-DD'});
+        $params->param('deadlinefrom', '') if lc($params->param('deadlinefrom')) eq 'now';
+        $deadlinefrom = SqlifyDate($params->param('deadlinefrom'));
         $sql_deadlinefrom = $dbh->quote($deadlinefrom);
         trick_taint($sql_deadlinefrom);
         my $term = "bugs.deadline >= $sql_deadlinefrom";
@@ -548,10 +546,8 @@ sub init {
       }
       
       if ($params->param('deadlineto')){
-        $deadlineto = $params->param('deadlineto');
-        validate_date($deadlineto)
-          || ThrowUserError('illegal_date', {date => $deadlineto,
-                                             format => 'YYYY-MM-DD'});
+        $params->param('deadlineto', '') if lc($params->param('deadlineto')) eq 'now';
+        $deadlineto = SqlifyDate($params->param('deadlineto'));
         $sql_deadlineto = $dbh->quote($deadlineto);
         trick_taint($sql_deadlineto);
         my $term = "bugs.deadline <= $sql_deadlineto";
index c7990fd24462dac20e8fff160f7a3c4db747e30f..a237fd347968e0ab147928d703eb7ed3fc2e683a 100644 (file)
@@ -317,7 +317,7 @@ function doOnSelectProduct(selectmode) {
                   value="[% default.deadlineto.0 FILTER html %]">
       </td>
       <td>
-        <small>(YYYY-MM-DD)</small>
+        <small>(YYYY-MM-DD or relative dates)</small>
       </td>
     </tr>
   [% END %]