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

Bug 40933 

Field table for new bugs


git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@311 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2009-08-27 10:45:41 +00:00
parent 68d8c9b0bb
commit a562e19066
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bugzilla/BugMail.pm
View File

@ -622,6 +622,7 @@ sub sendMail
} }
my $diffs = $difftext; my $diffs = $difftext;
my @showfieldvalues = (); # for HTML emails
if ($isnew) { if ($isnew) {
my $head = ""; my $head = "";
foreach my $f (@headerlist) { foreach my $f (@headerlist) {
@ -630,10 +631,11 @@ sub sendMail
# If there isn't anything to show, don't include this header. # If there isn't anything to show, don't include this header.
next unless $value; next unless $value;
# Only send estimated_time if it is enabled and the user is in the group. # Only send estimated_time if it is enabled and the user is in the group.
if (($f ne 'estimated_time' && $f ne 'deadline') || $user->is_timetracker) { if (($f ne 'work_time' && $f ne 'estimated_time' && $f ne 'deadline') || $user->is_timetracker) {
my $desc = $fielddescription{$f}; my $desc = $fielddescription{$f};
$head .= multiline_sprintf(FORMAT_DOUBLE, ["$desc:", $value], $head .= multiline_sprintf(FORMAT_DOUBLE, ["$desc:", $value],
FORMAT_2_SIZE); FORMAT_2_SIZE);
push @showfieldvalues, { desc => $desc, value => $value };
} }
} }
$diffs = $head . ($difftext ? "\n\n" : "") . $diffs; $diffs = $head . ($difftext ? "\n\n" : "") . $diffs;
@ -653,6 +655,7 @@ sub sendMail
my $vars = { my $vars = {
isnew => $isnew, isnew => $isnew,
showfieldvalues => \@showfieldvalues,
to => $user->email, to => $user->email,
bugid => $id, bugid => $id,
alias => Bugzilla->params->{'usebugaliases'} ? $values{'alias'} : "", alias => Bugzilla->params->{'usebugaliases'} ? $values{'alias'} : "",

9
template/en/default/email/newchangedmail.txt.tmpl
View File

@ -108,12 +108,21 @@ body { font-size: 10pt; }
.difft { font-size: 10pt; border-width: 0 0 1px 0; border-style: solid; border-color: #808080 } .difft { font-size: 10pt; border-width: 0 0 1px 0; border-style: solid; border-color: #808080 }
.difft td { border-width: 0 0 1px 0; border-style: solid; border-color: #808080 } .difft td { border-width: 0 0 1px 0; border-style: solid; border-color: #808080 }
.difft tr.n td { border-width: 0; } .difft tr.n td { border-width: 0; }
.difft.fv th { text-align: left; }
/*-->*/ /*-->*/
</style> </style>
<body [% IF severity == 'blocker' OR severity == 'critical' %]style="background-color: #FFC0C0"[% END %]> <body [% IF severity == 'blocker' OR severity == 'critical' %]style="background-color: #FFC0C0"[% END %]>
<p><a href="[%+ urlbase %]show_bug.cgi?id=[% bugid %]">Bug [% bugid %]</a> <p><a href="[%+ urlbase %]show_bug.cgi?id=[% bugid %]">Bug [% bugid %]</a>
(prod:[% product %].[% comp %], pri:[% priority %], sev:[% severity %], miles:[% targetmilestone %])</p> (prod:[% product %].[% comp %], pri:[% priority %], sev:[% severity %], miles:[% targetmilestone %])</p>
[% IF isnew AND showfieldvalues.size > 0 %]
<table class="difft fv">
[% FOR f = showfieldvalues %]
<tr><th>[% f.desc FILTER html %]:</th><td>[% f.value FILTER html %]</td></tr>
[% END %]
</table>
[% END %]
[% IF diffarray AND diffarray.size > 0 %] [% IF diffarray AND diffarray.size > 0 %]
<table class="difft" width="600px" style="border-collapse: collapse" cellpadding="3"> <table class="difft" width="600px" style="border-collapse: collapse" cellpadding="3">
[% FOR adiff = diffarray %] [% FOR adiff = diffarray %]