summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorIsrael Madueme <purelogiq@gmail.com>2018-03-19 15:57:17 +0100
committerDylan William Hardison <dylan@hardison.net>2018-03-19 15:57:17 +0100
commit085c32acdac27c99549dfb1bef50ccb8c3949294 (patch)
treedf277685851e28dc672535c3d116e373bab6ad62 /extensions
parentde8acf02800e292c9a43b5dfbe2b1f5c2fae2316 (diff)
downloadbugzilla-085c32acdac27c99549dfb1bef50ccb8c3949294.tar.gz
bugzilla-085c32acdac27c99549dfb1bef50ccb8c3949294.tar.xz
Bug 1440328 - Obfuscate mentor email for users that aren't logged in
Diffstat (limited to 'extensions')
-rw-r--r--extensions/BMO/template/en/default/pages/user_activity.html.tmpl1
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl2
-rw-r--r--extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl1
3 files changed, 3 insertions, 1 deletions
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 %]