summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-07-20 09:31:18 +0200
committerByron Jones <glob@mozilla.com>2015-07-20 09:31:18 +0200
commit93b2e363851bbb51936465c68e43c4b591f1284d (patch)
tree71c444de00736dbc904c12f8ae9cab67f6adfd37 /extensions
parentb217cb01e0d9588f8ed94a577c20eb9cb500e176 (diff)
downloadbugzilla-93b2e363851bbb51936465c68e43c4b591f1284d.tar.gz
bugzilla-93b2e363851bbb51936465c68e43c4b591f1284d.tar.xz
Bug 1185440 - activity bound to comments which are default-hidden is not hidden by default
Diffstat (limited to 'extensions')
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl11
1 files changed, 8 insertions, 3 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
index b752a47fe..2e81f1aba 100644
--- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
@@ -225,11 +225,16 @@
[%
BLOCK activity_body;
+ classes = "activity";
+ style = "";
IF activity.cc_only && !change_set.cc_only;
- '<div class="activity cc-only" style="display:none">';
- ELSE;
- '<div class="activity">';
+ classes = classes _ " cc-only";
+ style = ' style="display:none"';
+ END;
+ IF change_set.comment && change_set.comment.collapsed;
+ style = ' style="display:none"';
END;
+ '<div class="' _ classes _ '"' _ style _ '>';
FOREACH change IN activity.changes;
IF change.fieldname == 'cc' && !activity.cc_only && !change_set.cc_only;