Bug 1440328 - Obfuscate mentor email for users that aren't logged in

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 075c8edf9161231ed4ae07cc0067bbd0be244ac5..5603b943ffa5826521b57016058ef472f88b0bfb 100644 (file)
--- 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 a8d55c1372467e47935de2bed742b9b4fec8b52c..51919ab27154f2b0f7040b7e71fadf92b2f20667 100644 (file)
--- 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 d0a3abb5b65981bb9eca47c32941d2bc11b580e2..32e6499cbf7216a1f5590c61c70dccfb04c990a1 100644 (file)
--- 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 50193f894ae0e7b379d8e22e3d2d133aaa14c421..101e43546ec3cb55b3269829799695987b26d790 100644 (file)
--- 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 %]