Commit 50e28bb8 authored by jocuri%softhome.net's avatar jocuri%softhome.net

Patch for bug 253604: When commit a bug, validate timetracking before user…

Patch for bug 253604: When commit a bug, validate timetracking before user match; patch by Tiago R. Mello <tiago@async.com.br>; r=kiko, a=justdave.
parent 9de12464
......@@ -90,6 +90,16 @@ if (defined $::FORM{'id'}) {
# Make sure there are bugs to process.
scalar(@idlist) || ThrowUserError("no_bugs_chosen");
# Validate all timetracking fields
foreach my $field ("estimated_time", "work_time", "remaining_time") {
if (defined $::FORM{$field}) {
my $er_time = trim($::FORM{$field});
if ($er_time ne $::FORM{'dontchange'}) {
Bugzilla::Bug::ValidateTime($er_time, $field);
}
}
}
# do a match on the fields if applicable
# The order of these function calls is important, as both Flag::validate
......@@ -772,7 +782,6 @@ if (UserInGroup(Param('timetrackinggroup'))) {
if (defined $::FORM{$field}) {
my $er_time = trim($::FORM{$field});
if ($er_time ne $::FORM{'dontchange'}) {
Bugzilla::Bug::ValidateTime($er_time, $field);
DoComma();
$::query .= "$field = " . SqlQuote($er_time);
}
......@@ -1283,7 +1292,6 @@ foreach my $id (@idlist) {
if (!defined $::FORM{'comment'} || $::FORM{'comment'} =~ /^\s*$/) {
ThrowUserError('comment_required', undef, "abort");
}
Bugzilla::Bug::ValidateTime($work_time, 'work_time');
# AppendComment (called below) can in theory raise an error,
# but because we've already validated work_time here it's
# safe to log the entry before adding the comment.
......
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