From 08b64f4d41c9aaea365f1abdd53e59241468e820 Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net" <>
Date: Sat, 20 Nov 2004 22:28:10 +0000
Subject: Patch for bug 264868: show_bug.cgi should honour 'emailsuffix' in
 'Reassign bug to' field; patch by Marc Schumann <wurblzap@gmail.com>,
 r=vladd, a=justdave.

---
 template/en/default/bug/edit.html.tmpl                  | 2 +-
 template/en/default/bug/knob.html.tmpl                  | 4 ++--
 template/en/default/global/confirm-user-match.html.tmpl | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 2585c6c92..51c46e89d 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -289,7 +289,7 @@
        <td colspan="7">
          [% INCLUDE global/userselect.html.tmpl
             name => "qa_contact"
-            value => bug.qa_contact.email
+            value => bug.qa_contact.login
             accesskey => "q"
             size => 60
             emptyok => 1
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 8ab0ce0ad..589751ed2 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -96,10 +96,10 @@
         <a href="page.cgi?id=fields.html#assigned_to">Reassign</a> 
         [% terms.bug %] to
       </label>
-      [% safe_assigned_to = FILTER js; bug.assigned_to.email; END %]
+      [% safe_assigned_to = FILTER js; bug.assigned_to.login; END %]
       [% INCLUDE global/userselect.html.tmpl
            name => "assigned_to"
-           value => bug.assigned_to.email
+           value => bug.assigned_to.login
            size => 32
            onchange => "if ((this.value != '$safe_assigned_to') && (this.value != '')) {
                           document.changeform.knob[$knum].checked=true;
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 59346c4cd..25859cc0a 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -97,7 +97,7 @@
                     <select name="[% field.key FILTER html %]"
                      id="[% field.key FILTER html %]">
                       [% FOREACH match = query.value.users %]
-                        <option value="[% match.email FILTER html %]">
+                        <option value="[% match.login FILTER html %]">
                          [%- match.identity FILTER html -%]
                         </option>
                       [% END %]
@@ -118,7 +118,7 @@
                        multiple="multiple" size="[% query.value.users.size %]">
                       [% END %]
                       [% FOREACH match = query.value.users %]
-                        <option value="[% match.email FILTER html %]">
+                        <option value="[% match.login FILTER html %]">
                          [%- match.identity FILTER html -%]
                         </option>
                       [% END %]
-- 
cgit v1.2.3-24-g4f1b