diff options
| -rw-r--r-- | Bugzilla/BugMail.pm | 11 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/email/bugmail-header.txt.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/email/bugmail-header.txt.tmpl | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 31a0a1af2..069ebbe60 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -401,12 +401,15 @@ sub sendMail { push(@watchingrel, 'None') unless @watchingrel; push @watchingrel, map { user_id_to_login($_) } @$watchingRef; - my @changedfields = uniq map { $_->{field_name} } @display_diffs; + # BMO: Use field descriptions instead of field names in header + my @changedfields = uniq map { $_->{field_desc} } @display_diffs; + my @changedfieldnames = uniq map { $_->{field_name} } @display_diffs; # Add attachments.created to changedfields if one or more # comments contain information about a new attachment if (grep($_->type == CMT_ATTACHMENT_CREATED, @send_comments)) { - push(@changedfields, 'attachments.created'); + push(@changedfields, 'Attachment Created'); + push(@changedfieldnames, 'attachment.created'); } my $vars = { @@ -419,7 +422,8 @@ sub sendMail { reasonswatchheader => join(" ", @watchingrel), changer => $changer, diffs => \@display_diffs, - changedfields => \@changedfields, + changedfields => \@changedfields, + changedfieldnames => \@changedfieldnames, new_comments => \@send_comments, threadingmarker => build_thread_marker($bug->id, $user->id, !$bug->lastdiffed), referenced_bugs => $referenced_bugs, @@ -484,6 +488,7 @@ sub _get_diffs { my $diffs = $dbh->selectall_arrayref( "SELECT fielddefs.name AS field_name, + fielddefs.description AS field_desc, bugs_activity.bug_when, bugs_activity.removed AS old, bugs_activity.added AS new, bugs_activity.attach_id, bugs_activity.comment_id, bugs_activity.who diff --git a/extensions/BMO/template/en/default/email/bugmail-header.txt.tmpl b/extensions/BMO/template/en/default/email/bugmail-header.txt.tmpl index a17e44700..603cae8eb 100644 --- a/extensions/BMO/template/en/default/email/bugmail-header.txt.tmpl +++ b/extensions/BMO/template/en/default/email/bugmail-header.txt.tmpl @@ -33,4 +33,5 @@ X-Bugzilla-Priority: [% bug.priority %] X-Bugzilla-Assigned-To: [% bug.assigned_to.login %] X-Bugzilla-Target-Milestone: [% bug.target_milestone %] X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %] +X-Bugzilla-Changed-Field-Names: [% changedfieldnames.join(" ") %] [%+ threadingmarker %] diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl index afd359a34..0aed05d27 100644 --- a/template/en/default/email/bugmail-header.txt.tmpl +++ b/template/en/default/email/bugmail-header.txt.tmpl @@ -46,4 +46,5 @@ X-Bugzilla-Priority: [% bug.priority %] X-Bugzilla-Assigned-To: [% bug.assigned_to.login %] X-Bugzilla-Target-Milestone: [% bug.target_milestone %] X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %] +X-Bugzilla-Changed-Field-Names: [% changedfieldnames.join(" ") %] [%+ threadingmarker %] |