From a8ad5e97b6691454d0377d2f0bd27195a8c2a649 Mon Sep 17 00:00:00 2001 From: Dominik Sander Date: Thu, 2 Feb 2017 20:14:47 +0100 Subject: [PATCH] Fix devise confirmation form, unify unlock form Use `login` as the key for all devise request/resend forms. Fixes #1895 --- app/views/devise/confirmations/new.html.erb | 15 ++++++++++----- app/views/devise/unlocks/new.html.erb | 4 ++-- config/initializers/devise.rb | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 69d622be..4e5ac61f 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,20 +1,25 @@ <% content_for :title, "Resend confirmation" -%>
-
+
-

Resend confirmation instructions

<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'form-horizontal' }) do |f| %> <%= devise_error_messages! %>
- <%= f.label :email %> - <%= f.email_field :email, autofocus: true, class: 'form-control' %> + <%= f.label :login, class: 'col-md-2 col-md-offset-2 control-label' %> +
+ <%= f.text_field :login, autofocus: true, class: 'form-control' %> +
- <%= f.submit "Resend confirmation instructions", class: "btn btn-primary" %> +
+
+ <%= f.submit "Resend confirmation instructions", class: "btn btn-primary" %> +
+
<% end %> <%= render "devise/shared/links" %> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index 18cba393..e0bfeafd 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -9,9 +9,9 @@ <%= devise_error_messages! %>
- <%= f.label :email, class: 'col-md-2 col-md-offset-2 control-label' %> + <%= f.label :login, class: 'col-md-2 col-md-offset-2 control-label' %>
- <%= f.email_field :email, autofocus: true, class: 'form-control' %> + <%= f.text_field :login, autofocus: true, class: 'form-control' %>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 83bf9d81..69e80b3f 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -161,7 +161,7 @@ Devise.setup do |config| config.lock_strategy = Utils.if_present(ENV['LOCK_STRATEGY'], :to_sym) || :failed_attempts # Defines which key will be used when locking and unlocking an account - config.unlock_keys = [ :email ] + config.unlock_keys = [ :login ] # Defines which strategy will be used to unlock an account. # :email = Sends an unlock link to the user email