Bug 180966 - warnings in webserver error log (take 2)

r=joel, a=justdave
parent 9973264f
...@@ -267,7 +267,7 @@ sub match_field { ...@@ -267,7 +267,7 @@ sub match_field {
next if !defined($vars->{'mform'}->{$field}); next if !defined($vars->{'mform'}->{$field});
# Skip it if this is a --do_not_change-- field # Skip it if this is a --do_not_change-- field
next if $dontchange eq $vars->{'form'}->{$field}; next if $dontchange && $dontchange eq $vars->{'form'}->{$field};
# We need to move the query to $raw_field, where it will be split up, # We need to move the query to $raw_field, where it will be split up,
# modified by the search, and put back into $::FORM and $::MFORM # modified by the search, and put back into $::FORM and $::MFORM
......
...@@ -109,6 +109,8 @@ if (defined $::FORM{'dup_id'} && $::FORM{'knob'} eq "duplicate") { ...@@ -109,6 +109,8 @@ if (defined $::FORM{'dup_id'} && $::FORM{'knob'} eq "duplicate") {
ValidateComment($::FORM{'comment'}); ValidateComment($::FORM{'comment'});
$::FORM{'dontchange'} = '' unless exists $::FORM{'dontchange'};
# If the bug(s) being modified have dependencies, validate them # If the bug(s) being modified have dependencies, validate them
# and rebuild the list with the validated values. This is important # and rebuild the list with the validated values. This is important
# because there are situations where validation changes the value # because there are situations where validation changes the value
...@@ -730,20 +732,21 @@ if (defined $::FORM{'qa_contact'}) { ...@@ -730,20 +732,21 @@ if (defined $::FORM{'qa_contact'}) {
} }
# jeff.hedlund@matrixsi.com time tracking data processing: # jeff.hedlund@matrixsi.com time tracking data processing:
foreach my $field ("estimated_time", "remaining_time") { if (UserInGroup(Param('timetrackinggroup'))) {
foreach my $field ("estimated_time", "remaining_time") {
if (defined $::FORM{$field}) { if (defined $::FORM{$field}) {
my $er_time = trim($::FORM{$field}); my $er_time = trim($::FORM{$field});
if ($er_time ne $::FORM{'dontchange'}) { if ($er_time ne $::FORM{'dontchange'}) {
if ($er_time > 99999.99) { if ($er_time > 99999.99) {
ThrowUserError("value_out_of_range", {field => $field}); ThrowUserError("value_out_of_range", {field => $field});
} }
if ($er_time =~ /^(?:\d+(?:\.\d*)?|\.\d+)$/) { if ($er_time =~ /^(?:\d+(?:\.\d*)?|\.\d+)$/) {
DoComma(); DoComma();
$::query .= "$field = " . SqlQuote($er_time); $::query .= "$field = " . SqlQuote($er_time);
} else { } else {
$vars->{'field'} = $field; $vars->{'field'} = $field;
ThrowUserError("need_positive_number"); ThrowUserError("need_positive_number");
}
} }
} }
} }
...@@ -1202,18 +1205,19 @@ foreach my $id (@idlist) { ...@@ -1202,18 +1205,19 @@ foreach my $id (@idlist) {
SendSQL("select now()"); SendSQL("select now()");
$timestamp = FetchOneColumn(); $timestamp = FetchOneColumn();
if ($::FORM{'work_time'} > 99999.99) { delete $::FORM{'work_time'} unless UserInGroup(Param('timetrackinggroup'));
if ($::FORM{'work_time'} && $::FORM{'work_time'} > 99999.99) {
ThrowUserError("value_out_of_range", {field => 'work_time'}); ThrowUserError("value_out_of_range", {field => 'work_time'});
} }
if (defined $::FORM{'comment'} || defined $::FORM{'work_time'}) { if ($::FORM{'comment'} || $::FORM{'work_time'}) {
if ($::FORM{'work_time'} != 0 && if ($::FORM{'work_time'} &&
(!defined $::FORM{'comment'} || $::FORM{'comment'} =~ /^\s*$/)) { (!defined $::FORM{'comment'} || $::FORM{'comment'} =~ /^\s*$/)) {
ThrowUserError('comment_required'); ThrowUserError('comment_required');
} else { } else {
AppendComment($id, $::COOKIE{'Bugzilla_login'}, $::FORM{'comment'}, AppendComment($id, $::COOKIE{'Bugzilla_login'}, $::FORM{'comment'},
$::FORM{'commentprivacy'}, $timestamp, $::FORM{'work_time'}); $::FORM{'commentprivacy'}, $timestamp, $::FORM{'work_time'});
if ($::FORM{'work_time'} != 0) { if ($::FORM{'work_time'}) {
LogActivityEntry($id, "work_time", "", $::FORM{'work_time'}, LogActivityEntry($id, "work_time", "", $::FORM{'work_time'},
$whoid, $timestamp); $whoid, $timestamp);
$bug_changed = 1; $bug_changed = 1;
......
...@@ -164,7 +164,7 @@ sub GetBug { ...@@ -164,7 +164,7 @@ sub GetBug {
$bug->{'assignee_email'}) = FetchSQLData(); $bug->{'assignee_email'}) = FetchSQLData();
} }
$bug->{'open'} = IsOpenedState($bug->{'status'}); $bug->{'open'} = $bug->{'exists'} && IsOpenedState($bug->{'status'});
$bug->{'dependencies'} = []; $bug->{'dependencies'} = [];
return $bug; return $bug;
......
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