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

Bug 903337 - Do not display the CC list and the "Remove selected CCs" checkbox if the CC list is empty r=simon, a=glob

Bug 903337 - Do not display the CC list and the "Remove selected CCs" checkbox…
7cc0c53c · Sunil Joshi · Simon Green · 0b1ea79e · 7cc0c53c · 7cc0c53c
Commit 7cc0c53c authored Aug 27, 2013 by Sunil Joshi Committed by Simon Green Aug 27, 2013
4 changed files
--- 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"'

--- 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'

--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -738,7 +738,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'
@@ -748,7 +748,7 @@
            <br> 
          [% END %]
        [% END %]
-        [% bug.cc.size || 0  FILTER html %] 
+        [% bug.cc.size FILTER html %] 
        [% IF bug.cc.size == 1 %]
          user
        [% ELSE %]
@@ -779,7 +779,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 %]

--- 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 %]