better implementation of realnames support. remove overhead of two sql

calls from bug_form.

diff --git a/bug_form.pl b/bug_form.pl
index 735dd2f1d063c27a54e59eab4739d20f285d6f2b..176c380354dc12036977572d46c6939bcdd13ea6 100644 (file)
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -118,11 +118,8 @@ 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'});
+$bug{'assigned_to'} = DBID_to_real_or_loginname($bug{'assigned_to'});
+$bug{'reporter'} = DBID_to_real_or_loginname($bug{'reporter'});
 
 print qq{<FORM NAME="changeform" METHOD="POST" ACTION="process_bug.cgi">\n};
 
@@ -186,7 +183,7 @@ print "
     <TD ALIGN=RIGHT><B>OS:</B></TD>
     <TD><SELECT NAME=op_sys>" .
     make_options(\@::legal_opsys, $bug{'op_sys'}) .
-    "</SELECT><TD ALIGN=RIGHT><B>Reporter:</B></TD><TD>$bug{'reporter'} $bug{'reporter_name'}</TD>
+    "</SELECT><TD ALIGN=RIGHT><B>Reporter:</B></TD><TD>$bug{'reporter'}</TD>
      </TDTR><TR>
     <TD ALIGN=RIGHT><B><A HREF=\"bug_status.html\">Status:</A></B></TD>
       <TD>$bug{'bug_status'}</TD>
@@ -205,7 +202,7 @@ print "
   </TR><TR>
     <TD ALIGN=RIGHT><B><A HREF=\"bug_status.html#assigned_to\">Assigned&nbsp;To:
         </A></B></TD>
-      <TD>$bug{'assigned_to'} $bug{'assigned_name'}</TD>";
+      <TD>$bug{'assigned_to'}</TD>";
 
 if (Param("usetargetmilestone")) {
     my $url = "";
@@ -431,6 +428,10 @@ if ($canedit || $::userid == $assignedtoid ||
         Resolve bug, mark it as duplicate of bug # 
         <INPUT NAME=dup_id SIZE=6 ONCHANGE=\"document.changeform.knob\[$knum\].checked=true\"><br>\n";
         $knum++;
+        if ( $bug{'assigned_to'} =~ /(.*)\((.*)\)/ ) {
+           $bug{'assigned_to'} = $1;
+           chop($bug{'assigned_to'});
+        }
         my $assign_element = "<INPUT NAME=\"assigned_to\" SIZE=32 ONCHANGE=\"document.changeform.knob\[$knum\].checked=true\" VALUE=\"$bug{'assigned_to'}\">";
 
         print "<INPUT TYPE=radio NAME=knob VALUE=reassign> 

diff --git a/globals.pl b/globals.pl
index 948fa7feb69c4a6cc6e49f277dbd9532ee32eb98..32772df5650db8f91b27408912e48c08dd67be8a 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -546,14 +546,14 @@ sub InsertNewUser {
     return $password;
 }
 
-sub DBID_to_real_name {
+sub DBID_to_real_or_loginname {
     my ($id) = (@_);
-    SendSQL("SELECT realname FROM profiles WHERE userid = $id");
-    my ($r) = FetchSQLData();
+    SendSQL("SELECT login_name,realname FROM profiles WHERE userid = $id");
+    my ($l, $r) = FetchSQLData();
     if ($r eq "") {
-        return;
+        return $l;
     } else {
-        return "($r)";
+        return "$l ($r)";
     }
 }