Bug 903337 - Do not display the CC list and the "Remove selected CCs" checkbox if...

r=simon, a=glob

diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 8f5477e2302e78a3c507e5000f863bc2d8ac54e8..abc0f97bf137151974172eb5f7c861494298f433 100644 (file)
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -92,7 +92,7 @@ TUI_hide_default('attachment_text_field');
           cols    = constants.COMMENT_COLS
           wrap    = 'soft'
         %]
-        [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
+        [% IF NOT bug.cc.contains(user.login) %]
           <br>
           <input type="checkbox" id="addselfcc" name="addselfcc"
             [%~ ' checked="checked"'

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 67dcabd7563f45727ad479e27633bf210aeec754..518737788acd5e9676e1a117097c9eb444a28cfb 100644 (file)
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -255,7 +255,7 @@
               wrap    = 'soft'
               classes = classNames
             %]
-            [% IF NOT attachment.bug.cc || NOT attachment.bug.cc.contains(user.login) %]
+            [% IF NOT attachment.bug.cc.contains(user.login) %]
               <input type="checkbox" id="addselfcc" name="addselfcc"
                 [%~ ' checked="checked"'
                     IF user.settings.state_addselfcc.value == 'always'

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 5c84d71c6355d2ab49ed9da595ff90292b9a06e7..075fc518b81af9ed13771f3d75781716533e7ca7 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -731,7 +731,7 @@
       </th>
       <td>
         [% IF user.id %]
-          [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
+          [% IF NOT bug.cc.contains(user.login) %]
             <input type="checkbox" id="addselfcc" name="addselfcc"
               [% " checked=\"checked\""
                    IF user.settings.state_addselfcc.value == 'always'
@@ -741,7 +741,7 @@
             <br> 
           [% END %]
         [% END %]
-        [% bug.cc.size || 0  FILTER html %] 
+        [% bug.cc.size FILTER html %] 
         [% IF bug.cc.size == 1 %]
           user
         [% ELSE %]
@@ -772,7 +772,7 @@
                 %]
             </div>
           [% END %]
-          [% IF bug.cc %]
+          [% IF bug.cc.size %]
             <select id="cc" multiple="multiple" size="5"
               [% IF bug.user.canedit %]name="cc"[% END %]>
               [% FOREACH c = bug.cc %]

diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 7207e8cf9dde71bbaf52aa1e4af92c73ebcc4a0f..fb11bf010bf0bab3e3a8cde8d86eeb3e4e35b3ee 100644 (file)
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -76,7 +76,7 @@
       [% rightcells.push('qa_contact') %]
     [% END %]
     [% rightcells.push('') %]
-    [% IF bug.cc %]
+    [% IF bug.cc.size %]
       [% rightcells.push('cc') %]
     [% END %]
     [% IF bug.keywords %]