From 9e0b9a8beadc567ecff4f9b00ba3d6f9862dc513 Mon Sep 17 00:00:00 2001 From: Reed Loden Date: Sat, 27 Mar 2010 23:28:14 -0500 Subject: Bug 533927 - "email address domain filtering is applying to non-email fields in the history" [r=LpSolit a=LpSolit] --- template/en/default/bug/activity/table.html.tmpl | 60 +++++++++++------------- 1 file changed, 28 insertions(+), 32 deletions(-) (limited to 'template/en/default/bug/activity') 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 # David D. Kilzer + # Reed Loden #%] [%# INTERFACE: @@ -80,38 +81,8 @@ [%+ field_descs.${change.fieldname} FILTER html %] [% END %] - - [% 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 %] -   - [% END %] - - - [% 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 %] -   - [% END %] - + [% PROCESS change_column change_type = change.removed %] + [% PROCESS change_column change_type = change.added %] [% END %] [% END %] @@ -121,3 +92,28 @@ No changes have been made to this [% terms.bug %] yet.

[% END %] + +[% BLOCK change_column %] + + [% 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 %] +   + [% END %] + +[% END %] -- cgit v1.2.3-24-g4f1b