From 085c32acdac27c99549dfb1bef50ccb8c3949294 Mon Sep 17 00:00:00 2001 From: Israel Madueme Date: Mon, 19 Mar 2018 10:57:17 -0400 Subject: [PATCH] Bug 1440328 - Obfuscate mentor email for users that aren't logged in --- .../BMO/template/en/default/pages/user_activity.html.tmpl | 1 + .../template/en/default/bug_modal/activity_stream.html.tmpl | 2 +- .../en/default/hook/bug/comments-aftercomments.html.tmpl | 1 + template/en/default/bug/activity/table.html.tmpl | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl index 075c8edf9..5603b943f 100644 --- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl +++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl @@ -199,6 +199,7 @@ change.fieldname == 'reporter' || change.fieldname == 'qa_contact' || change.fieldname == 'cc' || + change.fieldname == 'bug_mentor' || change.fieldname == 'flagtypes.name' %] [% display_value(change.fieldname, change_type) FILTER email FILTER html %] [% ELSE %] diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index a8d55c137..51919ab27 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -365,7 +365,7 @@ ", " UNLESS loop.last; END; - CASE [ 'assigned_to', 'reporter', 'qa_contact', 'cc', 'flagtypes.name' ]; + CASE [ 'assigned_to', 'reporter', 'qa_contact', 'cc', 'bug_mentor', 'flagtypes.name' ]; value FILTER email; CASE 'reporter_accessible'; diff --git a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl index d0a3abb5b..32e6499cb 100644 --- a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl +++ b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl @@ -155,6 +155,7 @@ change.fieldname == 'reporter' || change.fieldname == 'qa_contact' || change.fieldname == 'cc' || + change.fieldname == 'bug_mentor' || change.fieldname == 'flagtypes.name' %] [% value FILTER email FILTER js %] [% ELSIF change.fieldtype == constants.FIELD_TYPE_DATETIME %] diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 50193f894..101e43546 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -107,6 +107,7 @@ change.fieldname == 'reporter' || change.fieldname == 'qa_contact' || change.fieldname == 'cc' || + change.fieldname == 'bug_mentor' || change.fieldname == 'flagtypes.name' %] [% display_value(change.fieldname, change_type) FILTER email FILTER html %] [% ELSE %] -- 2.47.3