Bug 414382: Remove the duplicated "CC myself" checkbox below the "Additional Comment...

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 1a99a061a21f7bbabb8a39e3397eabbff563bbf1..3d8dc1b296d916ca6bb7f059ddbd4528f6ea70b6 100644 (file)
--- 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%]&nbsp;total users
         [% IF user.id %]