From 72780239f1572950635e058caa4c28068034045f Mon Sep 17 00:00:00 2001 From: Dave Lawrence Date: Mon, 8 Apr 2013 16:03:09 -0400 Subject: Bug 148564 - Ability to ignore specific bugs (not get email from them, even as the reporter) r=glob,r/a=LpSolit --- template/en/default/account/prefs/email.html.tmpl | 43 +++++++++++++++++++++-- template/en/default/bug/edit.html.tmpl | 34 ++++++++++++++---- 2 files changed, 68 insertions(+), 9 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 3fcb86176..ef8d0ae29 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -45,7 +45,10 @@ function SetCheckboxes(setting) { for (var count = 0; count < document.userprefsform.elements.length; count++) { var theinput = document.userprefsform.elements[count]; - if (theinput.type == "checkbox" && !theinput.disabled) { + if (theinput.type == "checkbox" + && !theinput.disabled + && !theinput.name.match("remove_ignored_bug")) + { if (theinput.name.match("neg")) { theinput.checked = !setting; } @@ -285,6 +288,40 @@ You are currently not watching any users. [% END %]

-
+Ignore [% terms.Bugs %] -
+

+ You can specify a list of [% terms.bugs %] from which you never want to get + any email notification of any kind by adding their ID(s) as a comma-separated + list. Removing [% terms.abug %] by selecting it from the current ignored list + will re-enable email notifications for the [% terms.bug %]. +

+[% IF user.bugs_ignored.size %] +

+ You are currently ignoring: + + [% FOREACH bug = user.bugs_ignored %] + + + + + + + [% END %] +
+ + + [% bug.id FILTER html %] + [% bug.status FILTER html %] + [% IF user.can_see_bug(bug.id) %] + - [% bug.summary FILTER html %] + [% ELSE %] + (private) + [% END %] +
+

+[% END %] + +

Add [% terms.bugs %]:
+

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index c48b17c08..4c39b7cc3 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -92,19 +92,21 @@ [%# *** Reported and modified dates *** %] [% PROCESS section_dates %] - + [% PROCESS section_cclist %] - + + [% PROCESS section_bug_ignored %] + [% PROCESS section_spacer %] [% PROCESS section_see_also %] - + [% PROCESS section_customfields %] - + [% PROCESS section_spacer %] - + [% Hook.process("after_custom_fields") %] - + [% PROCESS section_flags %]
@@ -818,6 +820,26 @@ [% END %] +[%############################################################################%] +[%# Block for Bug Ignored #%] +[%############################################################################%] +[% BLOCK section_bug_ignored %] + [% IF user.id %] + + + + + + + + + + [% END %] +[% END %] + [%############################################################################%] [%# Block for See Also #%] [%############################################################################%] -- cgit v1.2.3-24-g4f1b