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

enviar el nombre del sitio en la invitación

Browse source
This commit is contained in:
f 2019-07-10 19:30:32 -03:00
parent c45446f40a
commit 1cc57df126
No known key found for this signature in database
GPG key ID: 2AE5A13E321F953D
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -32,7 +32,7 @@ Metrics/MethodLength:
- 'app/controllers/invitadxs_controller.rb'
- 'app/controllers/i18n_controller.rb'
- 'app/controllers/collaborations_controller.rb'
- 'app/controllers/usuaries_controller.rb'
Metrics/BlockLength:
Exclude:

11
app/controllers/usuaries_controller.rb
View file

@ -82,13 +82,20 @@ class UsuariesController < ApplicationController
# TODO: Enviar invitación igual! Podemos no usar el Mailer de
# DeviseInvitations y usar uno propio que contenga texto y se
# envíe de todas formas.
usuarie = Usuarie.invite! email: invitacion.address
usuarie = Usuarie.invite! email: invitacion.address,
skip_invitation: true
# No invitar al sitio si ya estaba en la lista!
next if @site.invitade?(usuarie) || @site.usuarie?(usuarie)
#
# XXX: En este caso no estamos enviando ninguna invitación
next if usuarie.sites.exists? @site.id
@site.roles << Rol.create(usuarie: usuarie, site: @site,
temporal: true, rol: invited_as)
# Invitamos después de crear el rol para que el correo de
# invitación pueda recibir el sitio.
usuarie.deliver_invitation
end
redirect_to site_usuaries_path(@site)

3
app/views/devise/mailer/invitation_instructions.haml
View file

@ -1,5 +1,6 @@
- binding.pry
%p= t("devise.mailer.invitation_instructions.hello", email: @resource.email)
%p= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url)
%p= t("devise.mailer.invitation_instructions.someone_invited_you", url: @resource.sites.first.name)
%p= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token)
- if @resource.invitation_due_at
%p= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format'))

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

@ -1,5 +1,5 @@
= t("devise.mailer.invitation_instructions.hello", email: @resource.email)
= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url)
= t("devise.mailer.invitation_instructions.someone_invited_you", url: @resource.sites.first.name)
= accept_invitation_url(@resource, invitation_token: @token)
- if @resource.invitation_due_at
= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format'))