From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 6 Jul 2019 03:11:17 +0000 (-0700)
Subject: Use $bug object instead of status in bugreport buginfo
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0f15f877b9258ef3868615473060c467672046ea;p=debbugs.git

Use $bug object instead of status in bugreport buginfo
---

diff --git a/templates/en_US/cgi/bugreport_buginfo.tx b/templates/en_US/cgi/bugreport_buginfo.tx
index 8f3870f9..f7d60513 100644
--- a/templates/en_US/cgi/bugreport_buginfo.tx
+++ b/templates/en_US/cgi/bugreport_buginfo.tx
@@ -4,85 +4,85 @@
             <span class="value"><a href="<: $bug.submitter_url :>"><: $bug.submitter.name :></a></span>
         </li>
         <li><span class="key">Date</span>
-            <span class="value"><: $status.date_text :></span>
+            <span class="value"><: $bug.created :></span>
         </li>
-        : if defined($status.owner) && $status.owner.length() {
+        : if $bug.has_owner {
         <li><span class="key">Owned by</span>
-            <span class="value"><: package_links("owner",$status.owner) :></span>
+            <span class="value"><a href="<: $bug.owner_url :>"><: $bug.owner.name :></a></span>
         </li>
         : }
         <li><span class="key">Severity</span>
             <span class="value">
-                <:- if $status.severity { :><em class="severity"><: } -:>
-                <:- $status.severity -:>
-                <:- if $status.severity { :></em><: } -:>
+                <:- if $bug.severity { :><em class="severity"><: } -:>
+                <:- $bug.severity -:>
+                <:- if $bug.severity { :></em><: } -:>
             </span>
         </li>
-        : if $status.tags_array {
+        : if $bug.tags.has_any_tags {
         <li><span class="key">Tags</span>
-            <span class="value"><: $status.tags_array.join(' ') :></span>
+            <span class="value"><: $bug.tags.as_string :></span>
         </li>
         : }
-        : if $status.mergedwith_array.count > 0 {
+        : if $bug.mergedwith.count > 0 {
         <li><span class="key">Merged with</span>
-            <span class="value"><: bug_links(bug=>$status.mergedwith_array).join(",\n") :></span>
+            <span class="value"><: bug_links(bug=>$bug.mergedwith).join(",\n") :></span>
         </li>
         : }
-        : if $status.found_versions.count {
+        : if $bug.has_found {
         <li><span class="key">Found in
-            version<:- if $status.found_versions.count > 1 { -:>s<: } -:></span>
-            <span class="value"><: $status.found_versions.join(', ') :></span>
+            version<:- if $bug.found.count > 1 { -:>s<: } -:></span>
+            <span class="value"><: $bug.found.join(', ') :></span>
         </li>
         : }
-        : if $status.fixed_versions.count {
+        : if $bug.has_fixed {
         <li><span class="key">Fixed in 
-            version<: if $status.fixed_versions.count > 1 { :>s<: } :></span>
-            <span class="value"><: $status.fixed_versions.join(', ') :></span>
+            version<: if $bug.fixed.count > 1 { :>s<: } :></span>
+            <span class="value"><: $bug.fixed.join(', ') :></span>
         </li>
         : }
-        <: if $status.done.length() { :>
+        <: if $bug.is_done { :>
         <li><span class="key">Done</span>
-            <span class="value"><: $status.done :></span>
+            <span class="value"><a href="<: $bug.done.url :>"><: $bug.done.name :></a></span>
         </li>
         : }
-        : if $status.blockedby_array.count {
+        : if $bug.blocked_by.count {
         <li><span class="key">Fix blocked by</span>
             <span class="value">
-                : for $status.blockedby_array -> $bug {
+                : for $bug.blockedby_array -> $bug {
                 <: bug_links("bug",$bug.bug_num) :>: <: $bug.subject -:>
                 <:- if !$~bug.is_last { :>, <:  } else {  :>.<: } :>
                 : }
             </span>
         </li>
         : }
-        : if $status.blocks_array.count {
+        : if $bug.blocks.count {
         <li><span class="key">Blocking fix for</span>
             <span class="value" 
-                  : for $status.blocks_array -> $bug {
+                  : for $bug.blocks_array -> $bug {
                   <: bug_links("bug",$bug.bug_num) :>: <: $bug.subject -:>
                   <:- if ! $~bug.is_last { :>, <:  } else {  :>.<: } :>
                   : }
             </span>
         </li>
         : }
-        : if $status.archived {
+        : if $bug.archived {
         <li><span class="key">Bug is</span>
             <span class="value">Archived</span>
         </li>
         : }
-        : if defined $status.forwarded and $status.forwarded.length() {
+        : if defined $bug.forwarded and $bug.forwarded.length() {
         <li><span class="key">Forwarded to</span>
-            <span class="value"><: split($status.forwarded,',\s+').map(maybelink).join(', ') :></span>
+            <span class="value"><: split($bug.forwarded,',\s+').map(maybelink).join(', ') :></span>
         </li>
         : }
-        : if defined $status.summary and $status.summary.length() {
+        : if defined $bug.summary and $bug.summary.length() {
         <li><span class="key">Summary</span>
-            <span class="value"><: $status.summary :></span>
+            <span class="value"><: $bug.summary :></span>
         </li>
         : }
-        : if defined $status.outlook and $status.outlook.length() {
+        : if defined $bug.outlook and $bug.outlook.length() {
         <li><span class="key">Outlook</span>
-            <span class="value"><: $status.outlook :></span>
+            <span class="value"><: $bug.outlook :></span>
         </li>
         : }
     </ul>