Backing out the checkin for bug 180966 (fix warnings in web server error log). …

Backing out the checkin for bug 180966 (fix warnings in web server error log). This checkin caused commenting on bugs to fail if timetracking is not enabled.
parent 0d804e66
...@@ -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 && $dontchange eq $vars->{'form'}->{$field}; next if $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,8 +109,6 @@ if (defined $::FORM{'dup_id'} && $::FORM{'knob'} eq "duplicate") { ...@@ -109,8 +109,6 @@ 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
...@@ -1204,22 +1202,21 @@ foreach my $id (@idlist) { ...@@ -1204,22 +1202,21 @@ foreach my $id (@idlist) {
SendSQL("select now()"); SendSQL("select now()");
$timestamp = FetchOneColumn(); $timestamp = FetchOneColumn();
if (UserInGroup(Param('timetrackinggroup'))) { if ($::FORM{'work_time'} > 99999.99) {
if ($::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 (defined $::FORM{'comment'} || defined $::FORM{'work_time'}) { if ($::FORM{'work_time'} != 0 &&
if ($::FORM{'work_time'} != 0 && (!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'} != 0) {
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'} = $bug->{'exists'} && IsOpenedState($bug->{'status'}); $bug->{'open'} = 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