diff --git a/mozilla/webtools/bugzilla/bug_form.pl b/mozilla/webtools/bugzilla/bug_form.pl index 1402a1a470e..735dd2f1d06 100644 --- a/mozilla/webtools/bugzilla/bug_form.pl +++ b/mozilla/webtools/bugzilla/bug_form.pl @@ -118,6 +118,9 @@ my $assignedtoid = $bug{'assigned_to'}; my $reporterid = $bug{'reporter'}; my $qacontactid = $bug{'qa_contact'}; + +$bug{'assigned_name'} = DBID_to_real_name($bug{'assigned_to'}); +$bug{'reporter_name'} = DBID_to_real_name($bug{'reporter'}); $bug{'assigned_to'} = DBID_to_name($bug{'assigned_to'}); $bug{'reporter'} = DBID_to_name($bug{'reporter'}); @@ -183,8 +186,8 @@ print " OS: Reporter:$bug{'reporter'} - + "Reporter:$bug{'reporter'} $bug{'reporter_name'} + Status: $bug{'bug_status'} Priority: @@ -202,7 +205,7 @@ print " Assigned To: - $bug{'assigned_to'}"; + $bug{'assigned_to'} $bug{'assigned_name'}"; if (Param("usetargetmilestone")) { my $url = ""; diff --git a/mozilla/webtools/bugzilla/globals.pl b/mozilla/webtools/bugzilla/globals.pl index 2d22038a3db..948fa7feb69 100644 --- a/mozilla/webtools/bugzilla/globals.pl +++ b/mozilla/webtools/bugzilla/globals.pl @@ -546,6 +546,16 @@ sub InsertNewUser { return $password; } +sub DBID_to_real_name { + my ($id) = (@_); + SendSQL("SELECT realname FROM profiles WHERE userid = $id"); + my ($r) = FetchSQLData(); + if ($r eq "") { + return; + } else { + return "($r)"; + } +} sub DBID_to_name { my ($id) = (@_); @@ -721,7 +731,7 @@ sub GetLongDescriptionAsHTML { $knownattachments{FetchOneColumn()} = 1; } - my ($query) = ("SELECT profiles.login_name, longdescs.bug_when, " . + my ($query) = ("SELECT profiles.realname, profiles.login_name, longdescs.bug_when, " . " longdescs.thetext " . "FROM longdescs, profiles " . "WHERE profiles.userid = longdescs.who " . @@ -740,12 +750,18 @@ sub GetLongDescriptionAsHTML { $query .= "ORDER BY longdescs.bug_when"; SendSQL($query); while (MoreSQLData()) { - my ($who, $when, $text) = (FetchSQLData()); + my ($who, $email, $when, $text) = (FetchSQLData()); if ($count) { - $result .= "

------- Additional Comments From " . - qq{$who } . - time2str("%Y-%m-%d %H:%M", str2time($when)) . - " -------
\n"; + $result .= "

------- Additional Comments From "; + if ($who) { + $result .= qq{$who } . + time2str("%Y-%m-%d %H:%M", str2time($when)) . + " -------
\n"; + } else { + $result .= qq{$email } . + time2str("%Y-%m-%d %H:%M", str2time($when)) . + " -------
\n"; + } } $result .= "
" . quoteUrls(\%knownattachments, $text) . "
\n"; $count++;