Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-15 06:51:42 +00:00
Code Issues Projects Releases Wiki Activity

fix: confirmar usuaries en la invitación #13247
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
f 2023-04-24 17:44:04 -03:00
parent 5c467e08b8
commit 229914e849
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/usuaries_controller.rb
View file

@ -96,6 +96,12 @@ class UsuariesController < ApplicationController
# XXX: La invitación tiene que ser enviada luego de crear el rol # XXX: La invitación tiene que ser enviada luego de crear el rol
if role.persisted? if role.persisted?
# Si es una cuenta manual que no está confirmada aun,
# aprovechar para reconfirmarla.
if !usuarie.confirmed? && !usuarie.created_by_invite?
usuarie.generate_confirmation_token!
end
usuarie.deliver_invitation usuarie.deliver_invitation
else else
raise ArgumentError, role.errors.full_messages raise ArgumentError, role.errors.full_messages

4
app/models/usuarie.rb
View file

@ -51,9 +51,9 @@ class Usuarie < ApplicationRecord
end end
# Les usuaries necesitan link de invitación si no tenían cuenta # Les usuaries necesitan link de invitación si no tenían cuenta
# o todavía no la confirmaron # y todavía no aceptaron la invitación anterior.
def needs_invitation_link? def needs_invitation_link?
(created_by_invite? && !invitation_accepted?) || !confirmed? created_by_invite? && !invitation_accepted?
end end
private private

4
app/views/devise/mailer/invitation_instructions.html.haml
View file

@ -18,5 +18,9 @@
format: :'devise.mailer.invitation_instructions.accept_until_format')) format: :'devise.mailer.invitation_instructions.accept_until_format'))
%p= t('devise.mailer.invitation_instructions.ignore') %p= t('devise.mailer.invitation_instructions.ignore')
- elsif !@resource.confirmed? && @resource.confirmation_token
= confirmation_url(@resource, confirmation_token: @token, change_locale_to: @resource.lang)
\
= t('devise.mailer.invitation_instructions.ignore')
- else - else
%p= link_to t('devise.mailer.invitation_instructions.sign_in'), root_url %p= link_to t('devise.mailer.invitation_instructions.sign_in'), root_url

4
app/views/devise/mailer/invitation_instructions.text.haml
View file

@ -18,6 +18,10 @@
format: :'devise.mailer.invitation_instructions.accept_until_format')) format: :'devise.mailer.invitation_instructions.accept_until_format'))
\ \
= t('devise.mailer.invitation_instructions.ignore') = t('devise.mailer.invitation_instructions.ignore')
- elsif !@resource.confirmed? && @resource.confirmation_token
= confirmation_url(@resource, confirmation_token: @token, change_locale_to: @resource.lang)
\
= t('devise.mailer.invitation_instructions.ignore')
- else - else
= root_url(change_locale_to: @resource.lang) = root_url(change_locale_to: @resource.lang)
= t('devise.mailer.invitation_instructions.sign_in') = t('devise.mailer.invitation_instructions.sign_in')