зеркало из https://github.com/mozilla/pjs.git
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.
This commit is contained in:
Родитель
3c3731e375
Коммит
3e502ccfd1
|
@ -267,7 +267,7 @@ sub match_field {
|
|||
next if !defined($vars->{'mform'}->{$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,
|
||||
# modified by the search, and put back into $::FORM and $::MFORM
|
||||
|
|
|
@ -109,8 +109,6 @@ if (defined $::FORM{'dup_id'} && $::FORM{'knob'} eq "duplicate") {
|
|||
|
||||
ValidateComment($::FORM{'comment'});
|
||||
|
||||
$::FORM{'dontchange'} = '' unless exists $::FORM{'dontchange'};
|
||||
|
||||
# If the bug(s) being modified have dependencies, validate them
|
||||
# and rebuild the list with the validated values. This is important
|
||||
# because there are situations where validation changes the value
|
||||
|
@ -1204,22 +1202,21 @@ foreach my $id (@idlist) {
|
|||
SendSQL("select now()");
|
||||
$timestamp = FetchOneColumn();
|
||||
|
||||
if (UserInGroup(Param('timetrackinggroup'))) {
|
||||
if ($::FORM{'work_time'} > 99999.99) {
|
||||
ThrowUserError("value_out_of_range", {field => 'work_time'});
|
||||
}
|
||||
if (defined $::FORM{'comment'} || defined $::FORM{'work_time'}) {
|
||||
if ($::FORM{'work_time'} != 0 &&
|
||||
(!defined $::FORM{'comment'} || $::FORM{'comment'} =~ /^\s*$/)) {
|
||||
ThrowUserError('comment_required');
|
||||
} else {
|
||||
AppendComment($id, $::COOKIE{'Bugzilla_login'}, $::FORM{'comment'},
|
||||
$::FORM{'commentprivacy'}, $timestamp, $::FORM{'work_time'});
|
||||
if ($::FORM{'work_time'} != 0) {
|
||||
LogActivityEntry($id, "work_time", "", $::FORM{'work_time'},
|
||||
$whoid, $timestamp);
|
||||
$bug_changed = 1;
|
||||
}
|
||||
if ($::FORM{'work_time'} > 99999.99) {
|
||||
ThrowUserError("value_out_of_range", {field => 'work_time'});
|
||||
}
|
||||
if (defined $::FORM{'comment'} || defined $::FORM{'work_time'}) {
|
||||
if ($::FORM{'work_time'} != 0 &&
|
||||
(!defined $::FORM{'comment'} || $::FORM{'comment'} =~ /^\s*$/)) {
|
||||
|
||||
ThrowUserError('comment_required');
|
||||
} else {
|
||||
AppendComment($id, $::COOKIE{'Bugzilla_login'}, $::FORM{'comment'},
|
||||
$::FORM{'commentprivacy'}, $timestamp, $::FORM{'work_time'});
|
||||
if ($::FORM{'work_time'} != 0) {
|
||||
LogActivityEntry($id, "work_time", "", $::FORM{'work_time'},
|
||||
$whoid, $timestamp);
|
||||
$bug_changed = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -164,7 +164,7 @@ sub GetBug {
|
|||
$bug->{'assignee_email'}) = FetchSQLData();
|
||||
}
|
||||
|
||||
$bug->{'open'} = $bug->{'exists'} && IsOpenedState($bug->{'status'});
|
||||
$bug->{'open'} = IsOpenedState($bug->{'status'});
|
||||
$bug->{'dependencies'} = [];
|
||||
|
||||
return $bug;
|
||||
|
|
Загрузка…
Ссылка в новой задаче