summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xshow_activity.cgi2
-rw-r--r--template/en/default/bug/activity/show.html.tmpl24
-rw-r--r--template/en/default/filterexceptions.pl4
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',