summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorPami Ketolainen <pami.ketolainen@jollamobile.com>2015-03-13 19:23:54 +0100
committerDylan William Hardison <dylan@hardison.net>2015-03-13 19:27:47 +0100
commit1d96fa1689470945545ac8e0f239357185e832a7 (patch)
treeede67cda677cfbf63bd05dd18f7884c0d931f6dc /template/en/default
parent592e6fda4108c6241344d236a2c182bb9ce10d76 (diff)
downloadbugzilla-1d96fa1689470945545ac8e0f239357185e832a7.tar.gz
bugzilla-1d96fa1689470945545ac8e0f239357185e832a7.tar.xz
Bug 1062718 - add the ability to disable sending of mail when updating bugs
r=dylan,a=sgreen
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/account/prefs/email.html.tmpl2
-rw-r--r--template/en/default/admin/groups/list.html.tmpl3
-rw-r--r--template/en/default/admin/params/groupsecurity.html.tmpl7
-rw-r--r--template/en/default/attachment/create.html.tmpl11
-rw-r--r--template/en/default/attachment/edit.html.tmpl6
-rw-r--r--template/en/default/bug/edit.html.tmpl7
-rw-r--r--template/en/default/list/edit-multiple.html.tmpl7
7 files changed, 41 insertions, 2 deletions
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')) %]
+ <tr>
+ <th>&nbsp;</th>
+ <td>
+ <input type="checkbox" name="minor_update" value="1">
+ <label class="" for="minor_update">
+ This is a minor update (do not send email)
+ </label>
+ </td>
+ </tr>
+ [% END %]
<tr>
<th>&nbsp;</th>
<td><input type="submit" id="create" value="Submit"></td>
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 %]
<div id="update_container">
+ [% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %]
+ <input type="checkbox" name="minor_update" value="1">
+ <label class="" for="minor_update">
+ This is a minor update (do not send email)
+ </label><br>
+ [% END %]
<input type="submit" value="Submit" id="update">
</div>
[% 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 @@
<div class="knob-buttons">
<input type="submit" value="Save Changes"
id="commit[% id FILTER css_class_quote %]">
+ [% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %]
+ <br>
+ <label class="" for="minor_update">
+ This is a minor update (do not send email)
+ </label>
+ <input type="checkbox" name="minor_update" value="1">
+ [% END %]
</div>
[% 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') %]
<input type="submit" id="commit" value="Commit">
+[% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %]
+ <br>
+ <input type="checkbox" name="minor_update" value="1">
+ <label for="minor_update">
+ This is a minor update (do not send email)
+ </label>
+[% END %]
[%############################################################################%]
[%# Select Menu Block #%]