Commit 802d584d82ca1abd23fb423a5e307ce2036585d3

Authored by Nathan Broadbent
1 parent f965f382
Exists in master and in 1 other branch production

Set email field on password reset page to the email that user entered on this page

app/views/devise/passwords/new.html.haml
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 = errors_for resource 3 = errors_for resource
4 .required 4 .required
5 = f.label :email 5 = f.label :email
6 - = f.text_field :email  
7 -  
8 - %div.buttons= f.submit "Send me reset password instructions"  
9 \ No newline at end of file 6 \ No newline at end of file
  7 + = f.text_field :email, :value => params[:email]
  8 +
  9 + %div.buttons= f.submit "Send me reset password instructions"
  10 +
app/views/devise/sessions/new.html.haml
1 - content_for :title, 'Sign in' 1 - content_for :title, 'Sign in'
  2 +- auth_key = Devise.authentication_keys.first
2 3
3 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| 4 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
4 - - auth_key = Devise.authentication_keys.first  
5 .required 5 .required
6 = f.label auth_key 6 = f.label auth_key
7 = f.text_field auth_key, :tabindex => 1 7 = f.text_field auth_key, :tabindex => 1
8 8
9 .required 9 .required
10 - = link_to 'forget it?', new_password_path(resource_name), :class => 'float-right' 10 + = link_to 'forget it?', new_password_path(resource_name), :class => 'float-right', :id => "forgot_password"
11 = f.label :password 11 = f.label :password
12 = f.password_field :password, :tabindex => 2 12 = f.password_field :password, :tabindex => 2
13 13
@@ -19,3 +19,10 @@ @@ -19,3 +19,10 @@
19 %div.buttons 19 %div.buttons
20 %button{:type => 'submit', :class => 'sign_in'}= "Sign in" 20 %button{:type => 'submit', :class => 'sign_in'}= "Sign in"
21 21
  22 +:javascript
  23 + $('a#forgot_password').click(function(){
  24 + // Set email field on password reset page to email that user entered on this page
  25 + location.href = $(this).attr('href') + "?email=" + $('#user_#{auth_key}').val();
  26 + return false;
  27 + });
  28 +