From: jocuri%softhome.net <>
Date: Sat, 20 Nov 2004 22:29:23 +0000 (+0000)
Subject: Patch for bug 264868: Use .login and .email correctly when 'emailsuffix' is used... 
X-Git-Tag: bugzilla-2.18~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a69f861f0340f03ce1ba1b2e7bbf56428e909a3;p=thirdparty%2Fbugzilla.git

Patch for bug 264868: Use .login and .email correctly when 'emailsuffix' is used; patch by Marc Schumann <wurblzap@gmail.com>, r=vladd, a=justdave.
---

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 60ee703107..fcce9ba61a 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -277,7 +277,7 @@
        </td>
        <td colspan="7">
          <input name="qa_contact" accesskey="q"
-                value="[% bug.qa_contact.email FILTER html %]" size="60">
+                value="[% bug.qa_contact.login FILTER html %]" size="60">
        </td>
      </tr>
    [% END %]
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index b93f8099db..c5ff1f6280 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -97,11 +97,11 @@
         [% terms.bug %] to
       </label>
       <input name="assigned_to" size="32"
-             onchange="if ((this.value != '[% bug.assigned_to.email FILTER js FILTER html %]') &&
+             onchange="if ((this.value != '[% bug.assigned_to.login FILTER js FILTER html %]') &&
                             (this.value != '')) {
                          document.changeform.knob[[% knum %]].checked=true;
                        }"
-             value="[% bug.assigned_to.email FILTER html %]">
+             value="[% bug.assigned_to.login FILTER html %]">
       <br>
       [% IF bug.isunconfirmed && bug.user.canconfirm %]
         &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="andconfirm" name="andconfirm">
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 59346c4cdc..25859cc0aa 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 %]