From 76e5ced1875498b9f4de15019abcb54a73ed09bc Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 3 Oct 2007 18:38:32 +0000
Subject: =?UTF-8?q?Bug=20324990:=20The=20"Bug=20Activity"=20page=20does=20?=
 =?UTF-8?q?not=20display=20the=20bug=20summary=20in=20the=20title=20of=20t?=
 =?UTF-8?q?he=20page=20-=20Patch=20by=20Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20B?=
 =?UTF-8?q?uclin=20<LpSolit@gmail.com>=20r=3Dbkor=20a=3DLpSolit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 show_activity.cgi                               |  2 +-
 template/en/default/bug/activity/show.html.tmpl | 24 ++++++++++++++----------
 template/en/default/filterexceptions.pl         |  4 ----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/show_activity.cgi b/show_activity.cgi
index 1eff56f3f..e12787230 100755
--- 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 c18e04bfd..a457df018 100644
--- 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 93305c1c8..1ae80430a 100644
--- 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', 
-- 
cgit v1.2.1