Bug 634243: Stop confirm-match.html.tmpl from sending extra, empty values for

each field being confirmed. This fixes a bug where confirming would fail, displaying a value with an extra comma at the end. r=LpSolit, a=LpSolit

Bug 634243: Stop confirm-match.html.tmpl from sending extra, empty values for
0b8a6e8c · Max Kanat-Alexander · 1bc66daa · 0b8a6e8c
Commit 0b8a6e8c authored Feb 15, 2011 by Max Kanat-Alexander
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

confirm-user-match.html.tmpl template/en/default/global/confirm-user-match.html.tmpl +6 -1

No files found.
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -150,6 +150,8 @@
                [% ELSE %]
                  matched
                  <b>[% query.value.users.0.identity FILTER html %]</b>
+                  <input type="hidden" name="[% field.key FILTER html %]"
+                         value="[% query.value.users.0.login FILTER html %]">
                [% END %]
            [% ELSE %]
                [% IF (query.key.length < 3) && !Param('emailsuffix') %]
@@ -174,7 +176,10 @@

 [% IF matchsuccess == 1 %]

-  [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
+  [% SET exclude_these = 
+           matches.keys.merge(['Bugzilla_login', 'Bugzilla_password']) %]
+  [% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
+  [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]

  <p>
    <input type="submit" id="continue" value="Continue">