Bug 324990: The "Bug Activity" page does not display the bug summary in the title...

diff --git a/show_activity.cgi b/show_activity.cgi
index 1eff56f3f8763720b13a9739fc71bc4e6eddfa95..e1278723048e4ef80c3f0e92f0eae71514ca054b 100755 (executable)
--- a/show_activity.cgi
+++ b/show_activity.cgi
@@ -53,7 +53,7 @@ ValidateBugID($bug_id);
 ($vars->{'operations'}, $vars->{'incomplete_data'}) = 
     Bugzilla::Bug::GetBugActivity($bug_id);
 
-$vars->{'bug_id'} = $bug_id;
+$vars->{'bug'} = new Bugzilla::Bug($bug_id);
 
 print $cgi->header();
 

diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl
index c18e04bfdf28d2c3a5bb1761ce7dec4a4f50ec60..a457df01800f07f56fc296328b79850d6b1d5190 100644 (file)
--- a/template/en/default/bug/activity/show.html.tmpl
+++ b/template/en/default/bug/activity/show.html.tmpl
@@ -19,27 +19,31 @@
   #%]
 
 [%# INTERFACE:
-  # bug_id: integer. The bug ID.
+  # bug: object. The bug whose activity is being displayed.
+  # operations: array of hashes, see activity/table.html.tmpl.
   #
   # This template also needs to be called with the interface to the
-  # activity.html.tmpl template fulfilled.
+  # activity/table.html.tmpl template fulfilled.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
 
+[% filtered_desc = bug.short_desc FILTER html %]
 [% PROCESS global/header.html.tmpl
-  title = "Changes made to $terms.bug $bug_id"
-  header = "Activity log"
-  subheader = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
+  title = "Changes made to $terms.bug $bug.bug_id"
+  header = "Activity log for $terms.bug $bug.bug_id: $filtered_desc"
  %]
 
-<br>
+<p>
+  [% "Back to $terms.bug $bug.bug_id" FILTER bug_link(bug.bug_id) FILTER none %]
+</p>
 
 [% PROCESS bug/activity/table.html.tmpl %]
 
-<p>
-  <a href="show_bug.cgi?id=[% bug_id %]">Back to [% terms.bug %] 
-  [%+ bug_id %]</a>
-</p>
+[% IF operations.size > 0 %]
+  <p>
+    [% "Back to $terms.bug $bug.bug_id" FILTER bug_link(bug.bug_id) FILTER none %]
+  </p>
+[% END %]
 
 [% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 93305c1c841be6bf0d99ab7f55c4c6caffb3e1c2..1ae80430a9cbdcaeb12ed83346de8c52a13405d7 100644 (file)
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -389,10 +389,6 @@
   'productstring', 
 ],
 
-'bug/activity/show.html.tmpl' => [
-  'bug_id', 
-],
-
 'bug/activity/table.html.tmpl' => [
   'change.attachid', 
   'change.field',