From 411c9ecb4b7396afe95bbf6f191616dcd3fc970c Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sat, 10 Feb 2018 17:09:44 +0100
Subject: [PATCH] Fix password recovery (#6459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Fix password recovery
* Use “resource” instead of “current_user”
---
app/views/auth/passwords/edit.html.haml | 20 ++++++++++----------
app/views/auth/registrations/edit.html.haml | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index d8fed9e776..703c821c07 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -1,18 +1,18 @@
- content_for :page_title do
= t('auth.set_new_password')
- = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
- = render 'shared/error_messages', object: resource
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+ = render 'shared/error_messages', object: resource
- - if use_pam? || current_user.encrypted_password.present?
- = f.input :reset_password_token, as: :hidden
+ - if !use_pam? || resource.encrypted_password.present?
+ = f.input :reset_password_token, as: :hidden
- = f.input :password, autofocus: true, placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' }
- = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }
+ = f.input :password, autofocus: true, placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' }
+ = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }
- .actions
- = f.button :button, t('auth.set_new_password'), type: :submit
- - else
- = t('simple_form.labels.defaults.pam_account')
+ .actions
+ = f.button :button, t('auth.set_new_password'), type: :submit
+ - else
+ = t('simple_form.labels.defaults.pam_account')
.form-footer= render 'auth/shared/links'
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 102199f819..ca18caa563 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -4,7 +4,7 @@
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: 'auth_edit' }) do |f|
= render 'shared/error_messages', object: resource
- - if !use_pam? || current_user.encrypted_password.present?
+ - if !use_pam? || resource.encrypted_password.present?
= f.input :email, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
= f.input :password, placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' }
= f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }