From 0f15f877b9258ef3868615473060c467672046ea Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Fri, 5 Jul 2019 20:11:17 -0700 Subject: [PATCH] Use $bug object instead of status in bugreport buginfo --- templates/en_US/cgi/bugreport_buginfo.tx | 58 ++++++++++++------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/templates/en_US/cgi/bugreport_buginfo.tx b/templates/en_US/cgi/bugreport_buginfo.tx index 8f3870f..f7d6051 100644 --- a/templates/en_US/cgi/bugreport_buginfo.tx +++ b/templates/en_US/cgi/bugreport_buginfo.tx @@ -4,85 +4,85 @@ <: $bug.submitter.name :>
  • Date - <: $status.date_text :> + <: $bug.created :>
  • - : if defined($status.owner) && $status.owner.length() { + : if $bug.has_owner {
  • Owned by - <: package_links("owner",$status.owner) :> + <: $bug.owner.name :>
  • : }
  • Severity - <:- if $status.severity { :><: } -:> - <:- $status.severity -:> - <:- if $status.severity { :><: } -:> + <:- if $bug.severity { :><: } -:> + <:- $bug.severity -:> + <:- if $bug.severity { :><: } -:>
  • - : if $status.tags_array { + : if $bug.tags.has_any_tags {
  • Tags - <: $status.tags_array.join(' ') :> + <: $bug.tags.as_string :>
  • : } - : if $status.mergedwith_array.count > 0 { + : if $bug.mergedwith.count > 0 {
  • Merged with - <: bug_links(bug=>$status.mergedwith_array).join(",\n") :> + <: bug_links(bug=>$bug.mergedwith).join(",\n") :>
  • : } - : if $status.found_versions.count { + : if $bug.has_found {
  • Found in - version<:- if $status.found_versions.count > 1 { -:>s<: } -:> - <: $status.found_versions.join(', ') :> + version<:- if $bug.found.count > 1 { -:>s<: } -:> + <: $bug.found.join(', ') :>
  • : } - : if $status.fixed_versions.count { + : if $bug.has_fixed {
  • Fixed in - version<: if $status.fixed_versions.count > 1 { :>s<: } :> - <: $status.fixed_versions.join(', ') :> + version<: if $bug.fixed.count > 1 { :>s<: } :> + <: $bug.fixed.join(', ') :>
  • : } - <: if $status.done.length() { :> + <: if $bug.is_done { :>
  • Done - <: $status.done :> + <: $bug.done.name :>
  • : } - : if $status.blockedby_array.count { + : if $bug.blocked_by.count {
  • Fix blocked by - : for $status.blockedby_array -> $bug { + : for $bug.blockedby_array -> $bug { <: bug_links("bug",$bug.bug_num) :>: <: $bug.subject -:> <:- if !$~bug.is_last { :>, <: } else { :>.<: } :> : }
  • : } - : if $status.blocks_array.count { + : if $bug.blocks.count {
  • Blocking fix for $bug { + : for $bug.blocks_array -> $bug { <: bug_links("bug",$bug.bug_num) :>: <: $bug.subject -:> <:- if ! $~bug.is_last { :>, <: } else { :>.<: } :> : }
  • : } - : if $status.archived { + : if $bug.archived {
  • Bug is Archived
  • : } - : if defined $status.forwarded and $status.forwarded.length() { + : if defined $bug.forwarded and $bug.forwarded.length() {
  • Forwarded to - <: split($status.forwarded,',\s+').map(maybelink).join(', ') :> + <: split($bug.forwarded,',\s+').map(maybelink).join(', ') :>
  • : } - : if defined $status.summary and $status.summary.length() { + : if defined $bug.summary and $bug.summary.length() {
  • Summary - <: $status.summary :> + <: $bug.summary :>
  • : } - : if defined $status.outlook and $status.outlook.length() { + : if defined $bug.outlook and $bug.outlook.length() {
  • Outlook - <: $status.outlook :> + <: $bug.outlook :>
  • : } -- 2.39.2