Skip to content

bugzilla
bugzilla
Commit 9e0b9a8b authored by Reed Loden's avatar Reed Loden
Browse files
Options

Bug 533927 - "email address domain filtering is applying to non-email fields in the history"

[r=LpSolit a=LpSolit]
parent cad688f0
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 32 deletions
template/en/default/bug/activity/table.html.tmpl
View file @ 9e0b9a8b
......@@ -17,6 +17,7 @@
#
# Contributor(s): Gervase Markham <gerv@gerv.net>
# David D. Kilzer <ddkilzer@kilzer.net>
# Reed Loden <reed@reedloden.com>
#%]
[%# INTERFACE:
......@@ -80,38 +81,8 @@
[%+ field_descs.${change.fieldname} FILTER html %]
[% END %]
</td>
<td>
[% IF change.removed.defined %]
[% IF change.fieldname == 'estimated_time' ||
change.fieldname == 'remaining_time' ||
change.fieldname == 'work_time' %]
[% PROCESS formattimeunit time_unit=change.removed %]
[% ELSIF change.fieldname == 'blocked' ||
change.fieldname == 'dependson' %]
[% change.removed FILTER bug_list_link FILTER none %]
[% ELSE %]
[% display_value(change.fieldname, change.removed) FILTER email FILTER html %]
[% END %]
[% ELSE %]
&nbsp;
[% END %]
</td>
<td>
[% IF change.added.defined %]
[% IF change.fieldname == 'estimated_time' ||
change.fieldname == 'remaining_time' ||
change.fieldname == 'work_time' %]
[% PROCESS formattimeunit time_unit=change.added %]
[% ELSIF change.fieldname == 'blocked' ||
change.fieldname == 'dependson' %]
[% change.added FILTER bug_list_link FILTER none %]
[% ELSE %]
[% display_value(change.fieldname, change.added) FILTER email FILTER html %]
[% END %]
[% ELSE %]
&nbsp;
[% END %]
</td>
[% PROCESS change_column change_type = change.removed %]
[% PROCESS change_column change_type = change.added %]
[% END %]
</tr>
[% END %]
......@@ -121,3 +92,28 @@
No changes have been made to this [% terms.bug %] yet.
</p>
[% END %]
[% BLOCK change_column %]
<td>
[% IF change_type.defined %]
[% IF change.fieldname == 'estimated_time' ||
change.fieldname == 'remaining_time' ||
change.fieldname == 'work_time' %]
[% PROCESS formattimeunit time_unit=change_type %]
[% ELSIF change.fieldname == 'blocked' ||
change.fieldname == 'dependson' %]
[% change_type FILTER bug_list_link FILTER none %]
[% ELSIF change.fieldname == 'assigned_to' ||
change.fieldname == 'reporter' ||
change.fieldname == 'qa_contact' ||
change.fieldname == 'cc' ||
change.fieldname == 'flagtypes.name' %]
[% display_value(change.fieldname, change_type) FILTER email FILTER html %]
[% ELSE %]
[% display_value(change.fieldname, change_type) FILTER html %]
[% END %]
[% ELSE %]
&nbsp;
[% END %]
</td>
[% END %]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment