summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Green <sgreen@redhat.com>2014-08-30 01:15:18 +0200
committerSimon Green <sgreen@redhat.com>2014-08-30 01:15:18 +0200
commit51fa7ceacb74fb2c8717f565169ccd78ddb91ff5 (patch)
tree0f3da5aa0cf995a5c78b88f227666116f1b20f86
parentec5caa57cc14a328b8b994d49cb8def8eb95aea7 (diff)
downloadbugzilla-51fa7ceacb74fb2c8717f565169ccd78ddb91ff5.tar.gz
bugzilla-51fa7ceacb74fb2c8717f565169ccd78ddb91ff5.tar.xz
Bug 1060233 - Aliases are not displayed correctly in some places
r=dkl, a=sgreen
-rw-r--r--template/en/default/bug/link.html.tmpl4
-rw-r--r--template/en/default/bug/show-multiple.html.tmpl7
2 files changed, 6 insertions, 5 deletions
diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl
index 40031e16f..b63093302 100644
--- a/template/en/default/bug/link.html.tmpl
+++ b/template/en/default/bug/link.html.tmpl
@@ -32,8 +32,8 @@
[% IF user.can_see_bug(bug) %]
[% link_title = link_title _ ' - ' _ bug.short_desc %]
- [% IF use_alias && bug.alias %]
- [% link_text = bug.alias %]
+ [% IF use_alias && bug.alias.size %]
+ [% link_text = bug.alias.join(', ') %]
[% END %]
[% END %]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index e09860201..960746d40 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -48,9 +48,10 @@
<h1>
[% terms.Bug %]
<a href="show_bug.cgi?id=[% bug.bug_id FILTER html %]">[% bug.bug_id FILTER html %]</a>
- [% IF bug.alias AND NOT bug.error %]
- (<a href="show_bug.cgi?id=[% bug.alias FILTER uri %]">
- [% bug.alias FILTER html %]</a>)
+ [% IF bug.alias AND NOT bug.error %] (
+ [%- FOREACH alias IN bug.alias %]<a href="show_bug.cgi?id=[% alias FILTER uri %]">
+ [% alias FILTER html %]</a>[% UNLESS loop.last %], [% END %]
+ [%- END %])
[% END %]
</h1>