GitHub-Mirror/huginn
2
0
Fork 0
mirror of https://github.com/Fishwaldo/huginn.git synced 2025-03-17 12:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix devise confirmation form, unify unlock form

Browse source 
Use `login` as the key for all devise request/resend forms.

Fixes #1895
This commit is contained in:
Dominik Sander 2017-02-02 20:14:47 +01:00
parent 0fccdc8471
commit a8ad5e97b6
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/views/devise/confirmations/new.html.erb
View file

@ -1,20 +1,25 @@
<% content_for :title, "Resend confirmation" -%>
<div class='row'>
<div class='col-md-8 col-md-offset-2'>
<div class='col-md-6 col-md-offset-3'>
<div class='well'>
<h2>Resend confirmation instructions</h2>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'form-horizontal' }) do |f| %>
<%= devise_error_messages! %>
<div class="form-group">
<%= 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' %>
<div class="col-md-6">
<%= f.text_field :login, autofocus: true, class: 'form-control' %>
</div>
</div>
<%= f.submit "Resend confirmation instructions", class: "btn btn-primary" %>
<div class="form-group">
<div class="col-md-offset-4 col-md-10">
<%= f.submit "Resend confirmation instructions", class: "btn btn-primary" %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>

4
app/views/devise/unlocks/new.html.erb
View file

@ -9,9 +9,9 @@
<%= devise_error_messages! %>
<div class="form-group">
<%= 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' %>
<div class="col-md-6">
<%= f.email_field :email, autofocus: true, class: 'form-control' %>
<%= f.text_field :login, autofocus: true, class: 'form-control' %>
</div>
</div>

2
config/initializers/devise.rb
View file

@ -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