Patch for bug 264868: show_bug.cgi should honour 'emailsuffix' in 'Reassign bug to...

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 2585c6c924e19117a10e89bebc71c1477388251d..51c46e89de81d7ab3b763705dc56382e3e049bde 100644 (file)
--- 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 8ab0ce0ad9301397a41e3679c3b27de3758e4aa0..589751ed2939fa24e951e1df2eb29c7f5b945ae2 100644 (file)
--- 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 59346c4cdc6fbf2f03ca4cb38f621784abff5509..25859cc0aaca0b16ce8d41b114d1a1501cd755e6 100644 (file)
--- 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 %]