summaryrefslogtreecommitdiffstats
path: root/template/en/default/bug/activity
diff options
context:
space:
mode:
authorReed Loden <reed@reedloden.com>2010-03-28 06:28:14 +0200
committerReed Loden <reed@reedloden.com>2010-03-28 06:28:14 +0200
commit9e0b9a8beadc567ecff4f9b00ba3d6f9862dc513 (patch)
tree08883b77f558649ccf2ef2b330a388bd7c4c3a1c /template/en/default/bug/activity
parentcad688f046229aa4c9cfe25c6d94f300524fb1f3 (diff)
downloadbugzilla-9e0b9a8beadc567ecff4f9b00ba3d6f9862dc513.tar.gz
bugzilla-9e0b9a8beadc567ecff4f9b00ba3d6f9862dc513.tar.xz
Bug 533927 - "email address domain filtering is applying to non-email fields in the history"
[r=LpSolit a=LpSolit]
Diffstat (limited to 'template/en/default/bug/activity')
-rw-r--r--template/en/default/bug/activity/table.html.tmpl60
1 files changed, 28 insertions, 32 deletions
diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl
index a8ad5bfa3..a9aca0a64 100644
--- a/template/en/default/bug/activity/table.html.tmpl
+++ b/template/en/default/bug/activity/table.html.tmpl
@@ -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 %]