Patch for bug 264868: Use .login and .email correctly when 'emailsuffix' is used...

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 60ee703107c0edd7a560569b84d59b2f9343cf8a..fcce9ba61a07d6f81f322b155c8e830189c55c05 100644 (file)
--- 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 b93f8099dba08e717cebecc7960d64f1ffbd6e3b..c5ff1f6280f61832df1790be50b131caf6746107 100644 (file)
--- 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 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 %]