From a48e145a7b49d54937cc8672d4e2e71780a08e15 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 16 Jun 2015 14:24:40 +0800
Subject: Bug 1146774: treeherder/tbpl comments are not automatically collapsed

---
 extensions/BugModal/Extension.pm                                  | 8 +++++++-
 .../template/en/default/bug_modal/activity_stream.html.tmpl       | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/extensions/BugModal/Extension.pm b/extensions/BugModal/Extension.pm
index 12245dc54..e19e06726 100644
--- a/extensions/BugModal/Extension.pm
+++ b/extensions/BugModal/Extension.pm
@@ -256,7 +256,13 @@ sub template_before_process {
     $vars->{tracking_flags_table} = \@tracking_table;
 
     # for the "view -> hide treeherder comments" menu item
-    $vars->{treeherder} = Bugzilla->treeherder_user;
+    my $treeherder_id = Bugzilla->treeherder_user->id;
+    foreach my $change_set (@{ $bug->activity_stream }) {
+        if ($change_set->{comment} && $change_set->{comment}->author->id == $treeherder_id) {
+            $vars->{treeherder} = Bugzilla->treeherder_user;
+            last;
+        }
+    }
 }
 
 sub bug_start_of_set_all {
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 33d8e73c6..7e4bc29d8 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
@@ -19,7 +19,9 @@
   <menuitem id="view-comments-only" label="Comments Only"></menuitem>
   <hr>
   <menuitem id="view-toggle-cc" label="Show CC Changes"></menuitem>
-  <menuitem id="view-toggle-treeherder" label="Hide Treeherder Comments" data-userid="[% treeherder.id FILTER none %]"></menuitem>
+  [% IF treeherder %]
+    <menuitem id="view-toggle-treeherder" label="Hide Treeherder Comments" data-userid="[% treeherder.id FILTER none %]"></menuitem>
+  [% END %]
 </menu>
 
 [%
-- 
cgit v1.2.3-24-g4f1b