From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 9 Aug 2008 15:48:27 +0000 (-0700)
Subject:  * Fix forwarded links
X-Git-Tag: release/2.6.0~486^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=14a92e3dd4adbbac9c41d71a20d8961bb336c8c7;p=debbugs.git

 * Fix forwarded links
 * Collapse newlines
---

diff --git a/templates/en_US/cgi/short_bug_status.tmpl b/templates/en_US/cgi/short_bug_status.tmpl
index 94392d65..82509307 100644
--- a/templates/en_US/cgi/short_bug_status.tmpl
+++ b/templates/en_US/cgi/short_bug_status.tmpl
@@ -48,8 +48,7 @@
      $output = q(<span>Owned by: ).package_links(owner=>$status{owner}).q(;</span>);
   }
   $output;
-}
-<span>Severity: {my $output = $status{severity};
+}<span>Severity: {my $output = $status{severity};
               if (isstrongseverity($status{severity})) {
                    $output = q(<em class="severity">).$status{severity}.q(</em>);
               }
@@ -61,8 +60,7 @@
     $output .= q(<span>Merged with ).join(qq(,\n),bug_links(bug=>$status{mergedwith_array})).qq(;</span>\n);
  }
  $output;
-}
-{my $output = '';
+}{my $output = '';
  if (@{$status{found_versions}} or @{$status{fixed_versions}}) {
     $output .= '<a href="'.
 	  version_url(package => $status{package},
@@ -84,14 +82,21 @@
     $output .= qq(</a>);
  }
  $output;
-}
-{ my $output = '';
+}{ my $output = '';
+ if (length($status{forwarded})) {
+    $output = "<span><strong>Forwarded</strong> to " . 
+              join(', ',
+		   map {maybelink($_)}
+	            split /\,\s+/,$status{forwarded}
+	          ).";</span>\n";
+ }
+ $output;
+}{ my $output = '';
   if (length($status{done})) {
      $output .= q(<span><strong>Done:</strong> ).html_escape($status{done}).q(;</span> )
   }
   $output;
-}
-{ my $output = '';
+}{ my $output = '';
   if (@{$status{blockedby_array}}) {
      $output .= q(<span>Fix blocked by ).
         join(q(, ),