diff options
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 7 | ||||
| -rw-r--r-- | template/en/default/bug/link.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/email/bugmail.html.tmpl | 23 | ||||
| -rw-r--r-- | template/en/default/email/flagmail.html.tmpl | 2 |
4 files changed, 18 insertions, 16 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index f23c6b85c..3ac7f6821 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -565,7 +565,7 @@ <td class="field_value" colspan="2"> <span id="duplicates"> [% FOREACH dupe = bug.duplicates %] - [% dupe.id FILTER bug_link(dupe, use_alias => 1) FILTER none %][% " " %] + [% INCLUDE bug/link.html.tmpl bug = dupe, link_text = dupe.id, use_alias = 1 %][% " " %] [% END %] </span> (<a href="buglist.cgi?bug_id=[% bug.duplicate_ids.join(",") FILTER html %]"> @@ -1014,10 +1014,9 @@ value="[% bug.${field.name}.join(', ') FILTER html %]"> [% END %] </span> - + [% FOREACH dep_bug = deps %] - [% dep_bug.id FILTER bug_link(dep_bug, use_alias => 1) - FILTER none %][% " " %] + [% INCLUDE bug/link.html.tmpl bug = dep_bug, link_text = dep_bug.id, use_alias = 1 %][% " " %] [% END %] [% IF bug.check_can_change_field(field.name, 0, 1) %] <span id="[% field.name FILTER html %]_edit_container" diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl index b63093302..f1e8d041a 100644 --- a/template/en/default/bug/link.html.tmpl +++ b/template/en/default/bug/link.html.tmpl @@ -8,6 +8,8 @@ [%# INTERFACE: # bug: a Bugzilla::Bug object + # user: the Bugzilla::User object to which this template is addressed. + # If not set, the currently logged in user object is used. # link_text: the text that we're highlighting. # use_alias: boolean; If true, we display the bug's alias as the link # text instead of link_text. diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index c3b8b357f..1a74db4dc 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -22,9 +22,10 @@ <div> [% IF comment.count %] [% comment_anchor = "#c$comment.count" %] - <b>[% "Comment # ${comment.count}" FILTER bug_link(bug, - {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none %] - on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %] + <b>[% INCLUDE bug/link.html.tmpl bug = bug, link_text = "Comment # ${comment.count}", + comment_num = comment.count, full_url = 1, user = to_user %] + on [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id", + full_url = 1, user = to_user %] from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b> [% END %] [% comment_div = comment.is_markdown ? "div" : "pre" %] @@ -86,14 +87,14 @@ [% SET in_table = 0 %] [% END %] [% IF change.blocker %] - [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] - depends on - [%+ "${terms.bug} ${change.blocker.id}" - FILTER bug_link(change.blocker, {full_url => 1, user => to_user}) FILTER none %], - which changed state. + [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %] + depends on + [%+ INCLUDE bug/link.html.tmpl bug = change.blocker, link_text = "$terms.bug $change.blocker.id", + full_url = 1, user = to_user %], + which changed state. [% ELSE %] - [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed - [%+ "${terms.bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] + [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed + [%+ INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id", full_url = 1, user = to_user %] [% END %] <br> [% IF in_table == 0 %] @@ -117,7 +118,7 @@ <th>[% field_label FILTER html %]</th> <td> [% IF change.field_name == "bug_id" %] - [% new_value FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] + [% INCLUDE bug/link.html.tmpl bug = bug, link_text = new_value, full_url = 1, user = to_user %] [% ELSE %] [% new_value FILTER html %] [% END %] diff --git a/template/en/default/email/flagmail.html.tmpl b/template/en/default/email/flagmail.html.tmpl index d0b61fbbc..1c8fc0731 100644 --- a/template/en/default/email/flagmail.html.tmpl +++ b/template/en/default/email/flagmail.html.tmpl @@ -47,7 +47,7 @@ </p> <p> - [% "$terms.Bug $bug.bug_id" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]: + [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %]: [%= bug.short_desc FILTER html %] </p> |