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

Bug 89105 - Fix numbering of cloned comments 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1462 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2011-11-01 15:59:48 +00:00
parent 0f8cf11efe
commit 9836adb1ed
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bugzilla/Template.pm
View File

@ -937,10 +937,10 @@ sub create {
},
# Used by bug/comments.html.tmpl
# FIXME find a better place for such functions
# FIXME find a better place for this function
'comment_indexes' => sub {
my ($comments) = @_;
return [ map { [ $_->{count}, $_->{comment_id}, $_->{type} != CMT_WORKTIME ? 1 : 0 ] } @$comments ];
return [ map { [ $_->{count}, $_->{comment_id}, $_->{type} != CMT_WORKTIME && $_->{type} != CMT_BACKDATED_WORKTIME ? 1 : 0 ] } @$comments ];
},
'json' => \&Bugzilla::Util::bz_encode_json,

8
enter_bug.cgi
View File

@ -495,7 +495,9 @@ if ($cloned_bug_id) {
my $cloned_comment = formvalue('cloned_comment', 0);
my $bug_desc = $cloned_bug->comments({ order => 'oldest_to_newest' });
my $isprivate = $bug_desc->[$cloned_comment]->is_private;
my ($comment_obj) = grep { $_->{count} == $cloned_comment } @$bug_desc;
$comment_obj ||= $bug_desc->[0];
my $isprivate = $comment_obj->is_private;
$vars->{'comment'} = "";
$vars->{'commentprivacy'} = 0;
@ -504,12 +506,12 @@ if ($cloned_bug_id) {
# We use "body" to avoid any format_comment text, which would be
# pointless to clone.
$vars->{'cloned_comment'} = $cloned_comment;
$vars->{'comment'} = $bug_desc->[$cloned_comment]->body;
$vars->{'comment'} = $comment_obj->body;
$vars->{'comment'} =~ s!bug\s*#?\s*(\d+)\s*,?\s*comment\s*#?\s*(\d+)!Bug $cloned_bug_id, comment $2!gso;
# CustIS Bug 66177: Attachment link in cloned comment
if ($bug_desc->[$cloned_comment]->type == CMT_ATTACHMENT_CREATED)
{
$vars->{comment} = "Created attachment ".$bug_desc->[$cloned_comment]->extra_data."\n$vars->{comment}";
$vars->{comment} = "Created attachment ".$comment_obj->extra_data."\n$vars->{comment}";
}
$vars->{'commentprivacy'} = $isprivate;
}