vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow setting RESOLVED DUPLICATE without comment if commentonduplicate is disabled

3col
Vitaliy Filippov 2015-09-07 16:43:08 +03:00
parent 1433ff9073
commit f157a22772
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Bugzilla/Bug.pm
View File

@ -1052,8 +1052,10 @@ sub _check_bug_status
}
# Check if a comment is required for this change (also for new bugs).
if ((!$old_status || $new_status->comment_required_on_change_from($old_status)) &&
!@{$self->{added_comments} || []})
# But honor only commentonduplicate if the bug was just marked as duplicate.
if ((!$old_status || $new_status->comment_required_on_change_from($old_status)) && !@{$self->{added_comments} || []} &&
(!$self->resolution || $self->resolution_obj->name ne Bugzilla->params->{duplicate_resolution} ||
$self->{_old_self} && $self->{_old_self}->resolution eq $self->resolution || Bugzilla->params->{commentonduplicate}))
{
ThrowUserError('comment_required', { old => $old_status, new => $new_status });
}
@ -1115,7 +1117,9 @@ sub _check_resolution
}
# Check if they're changing the resolution and need to comment.
if (Bugzilla->params->{commentonchange_resolution} && !$self->{added_comments})
# But honor only commentonduplicate if the bug was just marked as duplicate.
if (Bugzilla->params->{commentonchange_resolution} && !@{$self->{added_comments} || []} &&
(!$self->resolution || $self->resolution_obj->name ne Bugzilla->params->{duplicate_resolution} || Bugzilla->params->{commentonduplicate}))
{
ThrowUserError('comment_required');
}