diff options
| author | lpsolit%gmail.com <> | 2008-01-30 01:36:56 +0100 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2008-01-30 01:36:56 +0100 |
| commit | d4d4f377f6068bcfa2a9f1ddf66ed82bf77132d5 (patch) | |
| tree | bf24ca74bd62a1b93884514853383212965071fa /template/en | |
| parent | 49f2c30e0f0c82fdfc65f165996ee6d41ad67edb (diff) | |
| download | bugzilla-d4d4f377f6068bcfa2a9f1ddf66ed82bf77132d5.tar.gz bugzilla-d4d4f377f6068bcfa2a9f1ddf66ed82bf77132d5.tar.xz | |
Bug 414382: Remove the duplicated "CC myself" checkbox below the "Additional Comment" field in favor of the one near the CC list - Patch by Guy Pyrzak <guy.pyrzak@gmail.com> r/a=LpSolit
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 1a99a061a..3d8dc1b29 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -242,21 +242,6 @@ cols = constants.COMMENT_COLS %] - [% 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" - [% " checked=\"checked\"" - IF user.settings.state_addselfcc.value == 'always' - || (!has_role - && user.settings.state_addselfcc.value == 'cc_unless_role') %]> - <label for="addselfcc">Add [% user.identity FILTER html %] to CC list</label> - [% END %] [% ELSE %] <fieldset> <legend>Note</legend> @@ -786,15 +771,22 @@ </td> <td> [% IF user.id %] - <input type="checkbox" id="addselfcc_first" name="addselfcc" - [% ' checked="checked" ' + [% 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) %] + <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') - || bug.cc.contains( user.email ) %]> - <label for="addselfcc_first"> - Myself ([% INCLUDE user_identity user=> user FILTER collapse %]) - </label><br> + && user.settings.state_addselfcc.value == 'cc_unless_role') %]> + <label for="addselfcc"> + Myself ([% INCLUDE user_identity user=> user FILTER collapse %]) + </label> + <br> + [% END %] [% END %] [% bug.cc.size || 0 FILTER html%] total users [% IF user.id %] |