Bug 1146774: treeherder/tbpl comments are not automatically collapsed

Author: globau

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 {

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