From 861dd56bc901477eec23e060a143e24cc8b79384 Mon Sep 17 00:00:00 2001 From: Dave Lawrence Date: Thu, 11 Apr 2013 15:11:32 +0800 Subject: Bug 859480: Ability to ignore specific bugs (not get email from them, even as the reporter) --- template/en/default/account/prefs/email.html.tmpl | 43 +++++++++++++++++++++-- template/en/default/bug/edit.html.tmpl | 38 +++++++++++++++----- 2 files changed, 70 insertions(+), 11 deletions(-) (limited to 'template') diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 32d52fd8e..ffb153785 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -46,7 +46,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; } @@ -286,6 +289,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 d58154a01..45ea316b9 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -124,19 +124,21 @@ [%# *** Reported and modified dates *** %] [% PROCESS section_dates %] - + [% PROCESS section_cclist %] - + + [% PROCESS section_bug_ignored %] + [% PROCESS section_spacer %] - + [% PROCESS section_flags %] - - [% PROCESS section_see_also %] - + + [% PROCESS section_see_also %] + [% PROCESS section_spacer %] - + [% PROCESS section_customfields %] - + [% Hook.process("after_custom_fields") %]
@@ -856,6 +858,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