From: Simon Green <sgreen@redhat.com>
Date: Fri, 29 Aug 2014 23:15:18 +0000 (+1000)
Subject: Bug 1060233 - Aliases are not displayed correctly in some places
X-Git-Tag: bugzilla-4.5.6~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51fa7ceacb74fb2c8717f565169ccd78ddb91ff5;p=thirdparty%2Fbugzilla.git

Bug 1060233 - Aliases are not displayed correctly in some places
r=dkl, a=sgreen
---

diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl
index 40031e16ff..b63093302c 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 e098602011..960746d404 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>