From 1d96fa1689470945545ac8e0f239357185e832a7 Mon Sep 17 00:00:00 2001 From: Pami Ketolainen Date: Fri, 13 Mar 2015 14:23:54 -0400 Subject: Bug 1062718 - add the ability to disable sending of mail when updating bugs r=dylan,a=sgreen --- template/en/default/account/prefs/email.html.tmpl | 2 ++ template/en/default/admin/groups/list.html.tmpl | 3 ++- template/en/default/admin/params/groupsecurity.html.tmpl | 7 ++++++- template/en/default/attachment/create.html.tmpl | 11 +++++++++++ template/en/default/attachment/edit.html.tmpl | 6 ++++++ template/en/default/bug/edit.html.tmpl | 7 +++++++ template/en/default/list/edit-multiple.html.tmpl | 7 +++++++ 7 files changed, 41 insertions(+), 2 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 052484174..ab25ff8bb 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -123,6 +123,8 @@ function SetCheckboxes(setting) { description = "The $terms.bug is in the UNCONFIRMED state" }, { id = constants.EVT_CHANGED_BY_ME, description = "The change was made by me" }, + { id = constants.EVT_MINOR_UPDATE, + description = "The change was marked as a minor update" }, ] %] [% relationships = [ diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index 673c053cb..33732f957 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -76,7 +76,8 @@ %] [% FOREACH group IN ["chartgroup", "comment_taggers_group", "debug_group", - "insidergroup", "querysharegroup", "timetrackinggroup"] %] + "insidergroup", "minor_update_group", "querysharegroup", + "timetrackinggroup"] %] [% special_group = Param(group) %] [% IF special_group %] diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl index 590f4da02..19d78de5a 100644 --- a/template/en/default/admin/params/groupsecurity.html.tmpl +++ b/template/en/default/admin/params/groupsecurity.html.tmpl @@ -51,6 +51,11 @@ "view it. If it is off, a user needs to be a member of all " _ "the $terms.bug's groups. Note that in either case, if the " _ "user has a role on the $terms.bug (e.g. reporter) that may " _ - "also affect their permissions." + "also affect their permissions.", + + minor_update_group => "The name of the group of users who are allowed to " _ + "use the 'minor update'-option on $terms.bug changes " _ + "to limit mail sending. " _ + "Setting this to empty disables the feature.", } %] diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index e566b428e..05223ede4 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -119,6 +119,17 @@ TUI_hide_default('attachment_text_field'); [% Hook.process('form_before_submit') %] + [% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %] + +   + + + + + + [% END %]   diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index 184cdde05..d2554dfb8 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -283,6 +283,12 @@ [% IF user.id %]
+ [% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %] + +
+ [% END %]
[% END %] diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 6bb75b985..f23c6b85c 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -1240,6 +1240,13 @@
+ [% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %] +
+ + + [% END %]
[% END %] [% END %] diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index d956fa62b..4ef067201 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -395,6 +395,13 @@ [%+ Hook.process('after_groups') %] +[% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %] +
+ + +[% END %] [%############################################################################%] [%# Select Menu Block #%] -- cgit v1.2.3-24-g4f1b