diff options
| -rwxr-xr-x | checksetup.pl | 6 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/global/setting-descs.none.tmpl | 4 |
3 files changed, 21 insertions, 1 deletions
diff --git a/checksetup.pl b/checksetup.pl index d572c2bf3..c3b719c4c 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -4441,6 +4441,12 @@ add_setting ("zoom_textareas", {"on" => 1, "off" => 2 }, "on" ); # 2005-10-21 LpSolit@gmail.com -- Bug 313020 add_setting('per_bug_queries', {'on' => 1, 'off' => 2}, 'on'); +# 2006-05-01 olav@bkor.dhs.org -- Bug 7710 +add_setting('state_addselfcc', {'always' => 1, + 'never' => 2, + 'cc_unless_role' => '3'}, + 'cc_unless_role'); + ########################################################################### # Create Administrator --ADMIN-- ########################################################################### diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index c2bd1b50b..51f4223f3 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -573,8 +573,18 @@ %] [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %] + [% has_role = bug.user.isreporter + || bug.assigned_to.id == user.id + || (Param('useqacontact') + && bug.qa_contact + && bug.qa_contact.id == user.id) %] + <br> - <input type="checkbox" id="addselfcc" name="addselfcc"> + <input type="checkbox" id="addselfcc" name="addselfcc" + [% " checked=\"checked\"" + IF user.settings.state_addselfcc.value == 'always' + || (!has_role + && user.settings.state_addselfcc.value == 'cc_unless_role') %]> <label for="addselfcc">Add [% user.login FILTER html %] to CC list</label> [% END %] <br> diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl index a0dbeb1a3..6962d9ea6 100644 --- a/template/en/default/global/setting-descs.none.tmpl +++ b/template/en/default/global/setting-descs.none.tmpl @@ -34,5 +34,9 @@ "next_bug" => "Show next $terms.bug in my list", "same_bug" => "Show the updated $terms.bug", "nothing" => "Do Nothing", + "state_addselfcc" => "Automatically add me to the CC list of bugs I change", + "always" => "Always", + "never" => "Never", + "cc_unless_role" => "Only if I have no role on them", } %] |