aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunil Joshi <joshi_sunil@in.com>2013-08-27 08:34:30 +1000
committerSimon Green <sgreen@redhat.com>2013-08-27 08:34:30 +1000
commit7cc0c53c360dde719ecad8139ab0fe7c2a65a640 (patch)
tree117f7a25033b54631cab2e5deb0585435b32462c
parent0b1ea79edf45677d41c2cc8f2c71426a3a5fb097 (diff)
downloadbugs-7cc0c53c360dde719ecad8139ab0fe7c2a65a640.tar
bugs-7cc0c53c360dde719ecad8139ab0fe7c2a65a640.tar.gz
bugs-7cc0c53c360dde719ecad8139ab0fe7c2a65a640.tar.bz2
bugs-7cc0c53c360dde719ecad8139ab0fe7c2a65a640.tar.xz
bugs-7cc0c53c360dde719ecad8139ab0fe7c2a65a640.zip
Bug 903337 - Do not display the CC list and the "Remove selected CCs" checkbox if the CC list is empty
r=simon, a=glob
-rw-r--r--template/en/default/attachment/create.html.tmpl2
-rw-r--r--template/en/default/attachment/edit.html.tmpl2
-rw-r--r--template/en/default/bug/edit.html.tmpl6
-rw-r--r--template/en/default/bug/show-multiple.html.tmpl2
4 files changed, 6 insertions, 6 deletions
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 8f5477e23..abc0f97bf 100644
--- 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 67dcabd75..518737788 100644
--- 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 54e1cdb7a..683d6ed4a 100644
--- 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 %]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index a20daedfa..e55a7cad4 100644
--- 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 %]