diff options
| author |   Reed Loden <reed@reedloden.com> | 2010-03-27 23:38:48 -0500 |
|---|---|---|
| committer | Reed Loden <reed@reedloden.com> | 2010-03-27 23:38:48 -0500 |
| commit | 959e4be8443c61aac66d2cd00191ba1e49b0b994 (patch) | |
| tree | 979f0a7f45174228525abfd09bbac6a3a0df9c41 | |
| parent | Bug 553267: Allow specifying that you don't want flag data, for config.cgi (diff) | |
| download | bugzilla-959e4be8443c61aac66d2cd00191ba1e49b0b994.tar.gz bugzilla-959e4be8443c61aac66d2cd00191ba1e49b0b994.tar.bz2 bugzilla-959e4be8443c61aac66d2cd00191ba1e49b0b994.zip | |
Bug 533927 - "email address domain filtering is applying to non-email fields in the history"
[r=LpSolit a=LpSolit]
| -rw-r--r-- | template/en/default/bug/activity/table.html.tmpl | 72 |
1 files changed, 32 insertions, 40 deletions
diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 156837904..cdea77f1a 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: @@ -74,48 +75,39 @@ [% END %] [%+ field_descs.${change.fieldname} FILTER html %] </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 == 'bug_status' %] - [% get_status(change.removed) FILTER html %] - [% ELSIF change.fieldname == 'resolution' %] - [% get_resolution(change.removed) FILTER html %] - [% ELSIF change.fieldname == 'blocked' || - change.fieldname == 'dependson' %] - [% change.removed FILTER bug_list_link FILTER none %] - [% ELSE %] - [% change.removed FILTER email FILTER html %] - [% END %] - [% ELSE %] - - [% 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 == 'bug_status' %] - [% get_status(change.added) FILTER html %] - [% ELSIF change.fieldname == 'resolution' %] - [% get_resolution(change.added) FILTER html %] - [% ELSIF change.fieldname == 'blocked' || - change.fieldname == 'dependson' %] - [% change.added FILTER bug_list_link FILTER none %] - [% ELSE %] - [% change.added FILTER email FILTER html %] - [% END %] - [% ELSE %] - - [% END %] - </td> + [% PROCESS change_column change_type = change.removed %] + [% PROCESS change_column change_type = change.added %] [% END %] </tr> [% END %] </table> [% 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 == 'bug_status' %] + [% get_status(change_type) FILTER html %] + [% ELSIF change.fieldname == 'resolution' %] + [% get_resolution(change_type) FILTER html %] + [% 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' %] + [% change_type FILTER email FILTER html %] + [% ELSE %] + [% change_type FILTER html %] + [% END %] + [% ELSE %] + + [% END %] + </td> +[% END %] |