Commit 88a69f20 authored by ghendricks%novell.com's avatar ghendricks%novell.com

Bug 283609 - Search for relative dates in deadline

patch by ghendricks@novell.com r=LpSolit, a=LpSolit
parent a8ae1c34
...@@ -533,10 +533,8 @@ sub init { ...@@ -533,10 +533,8 @@ sub init {
my $deadlineto; my $deadlineto;
if ($params->param('deadlinefrom')){ if ($params->param('deadlinefrom')){
$deadlinefrom = $params->param('deadlinefrom'); $params->param('deadlinefrom', '') if lc($params->param('deadlinefrom')) eq 'now';
validate_date($deadlinefrom) $deadlinefrom = SqlifyDate($params->param('deadlinefrom'));
|| ThrowUserError('illegal_date', {date => $deadlinefrom,
format => 'YYYY-MM-DD'});
$sql_deadlinefrom = $dbh->quote($deadlinefrom); $sql_deadlinefrom = $dbh->quote($deadlinefrom);
trick_taint($sql_deadlinefrom); trick_taint($sql_deadlinefrom);
my $term = "bugs.deadline >= $sql_deadlinefrom"; my $term = "bugs.deadline >= $sql_deadlinefrom";
...@@ -548,10 +546,8 @@ sub init { ...@@ -548,10 +546,8 @@ sub init {
} }
if ($params->param('deadlineto')){ if ($params->param('deadlineto')){
$deadlineto = $params->param('deadlineto'); $params->param('deadlineto', '') if lc($params->param('deadlineto')) eq 'now';
validate_date($deadlineto) $deadlineto = SqlifyDate($params->param('deadlineto'));
|| ThrowUserError('illegal_date', {date => $deadlineto,
format => 'YYYY-MM-DD'});
$sql_deadlineto = $dbh->quote($deadlineto); $sql_deadlineto = $dbh->quote($deadlineto);
trick_taint($sql_deadlineto); trick_taint($sql_deadlineto);
my $term = "bugs.deadline <= $sql_deadlineto"; my $term = "bugs.deadline <= $sql_deadlineto";
......
...@@ -317,7 +317,7 @@ function doOnSelectProduct(selectmode) { ...@@ -317,7 +317,7 @@ function doOnSelectProduct(selectmode) {
value="[% default.deadlineto.0 FILTER html %]"> value="[% default.deadlineto.0 FILTER html %]">
</td> </td>
<td> <td>
<small>(YYYY-MM-DD)</small> <small>(YYYY-MM-DD or relative dates)</small>
</td> </td>
</tr> </tr>
[% END %] [% END %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment