mirror of
https://0xacab.org/sutty/sutty
synced 2025-02-23 21:11:50 +00:00
Merge branch 'issue-12950' into 'rails'
fix: mantener la notificación hasta que se confirme el correo #12950 See merge request sutty/sutty!143
This commit is contained in:
commit
d48bac9c59
1 changed files with 11 additions and 0 deletions
|
@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
before_action :prepare_exception_notifier
|
||||
before_action :configure_permitted_parameters, if: :devise_controller?
|
||||
before_action :notify_unconfirmed_email, unless: :devise_controller?
|
||||
around_action :set_locale
|
||||
|
||||
rescue_from Pundit::NilPolicyError, with: :page_not_found
|
||||
|
@ -27,6 +28,15 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
private
|
||||
|
||||
def notify_unconfirmed_email
|
||||
return unless current_usuarie
|
||||
return if current_usuarie.confirmed?
|
||||
|
||||
I18n.with_locale(current_usuarie.lang) do
|
||||
flash[:notice] ||= I18n.t('devise.registrations.signed_up')
|
||||
end
|
||||
end
|
||||
|
||||
def uuid?(string)
|
||||
/[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}/ =~ string
|
||||
end
|
||||
|
@ -84,6 +94,7 @@ class ApplicationController < ActionController::Base
|
|||
protected
|
||||
|
||||
def configure_permitted_parameters
|
||||
devise_parameter_sanitizer.permit(:sign_up, keys: Usuarie::CONSENT_FIELDS)
|
||||
devise_parameter_sanitizer.permit(:account_update, keys: %i[lang])
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue