diff options
| author | Byron Jones <glob@mozilla.com> | 2015-03-31 16:17:44 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-03-31 16:17:44 +0200 |
| commit | b527e84a026f0211391f93b487b33009f7cb0bce (patch) | |
| tree | 93495e815ff288a7d575cdef5e3a4dd32a17c3af /extensions | |
| parent | 49bd70ad791e822a2a0a2c43bc3396cb32666558 (diff) | |
| download | bugzilla-b527e84a026f0211391f93b487b33009f7cb0bce.tar.gz bugzilla-b527e84a026f0211391f93b487b33009f7cb0bce.tar.xz | |
Bug 1147292: automatic CC when commenting isn't implemented
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl | 29 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.css | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl index ff2562bf4..f6c3bb3fa 100644 --- a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl @@ -25,5 +25,34 @@ <textarea rows="5" cols="80" name="comment" id="comment"></textarea> <div id="after-comment-commit-button"> [% Hook.process("after_comment_commit_button", 'bug/edit.html.tmpl') %] + + [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %] + [% + IF user.settings.state_addselfcc.value == 'always'; + check_add_self = 1; + ELSIF user.settings.state_addselfcc.value == 'cc_unless_role'; + check_add_self = !( + bug.user.isreporter + || bug.assigned_to.id == user.id + || (bug.qa_contact && bug.qa_contact.id == user.id) + ); + ELSE; + check_add_self = 0; + END; + %] + [%# this is in a table to match the alignment of the added-by-extensions + checkboxes (needinfo, restrict-comments) %] + <table> + <tr> + <td> + <input type="checkbox" name="addselfcc" id="add-self-cc" + [%~ " checked" IF check_add_self %]> + </td> + <td> + <label for="add-self-cc">Add me to CC list (follow this [% terms.bug %])</label> + </td> + </tr> + </table> + [% END %] </div> </div> diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css index b8ce1f584..75a772d2a 100644 --- a/extensions/BugModal/web/bug_modal.css +++ b/extensions/BugModal/web/bug_modal.css @@ -243,6 +243,7 @@ input[type="number"] { #after-comment-commit-button { margin-left: -8px; + margin-bottom: 4px; } #needinfo_from_autocomplete { |