Merge branch 'dev'
This commit is contained in:
commit
310d193173
3 changed files with 20 additions and 14 deletions
|
@ -1,21 +1,23 @@
|
||||||
class Users::Dossiers::InvitesController < UsersController
|
class Users::Dossiers::InvitesController < UsersController
|
||||||
def authenticate_user!
|
def authenticate_user!
|
||||||
session["user_return_to"] = request.fullpath
|
session["user_return_to"] = request.fullpath
|
||||||
|
email = params[:email]
|
||||||
|
|
||||||
if params[:email].present? && User.find_by(email: params[:email]).nil?
|
if email.present? && User.find_by(email: email).nil?
|
||||||
return redirect_to new_user_registration_path(user: { email: params[:email] })
|
redirect_to new_user_registration_path(user: { email: email })
|
||||||
|
else
|
||||||
|
super
|
||||||
end
|
end
|
||||||
|
|
||||||
super
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@facade = InviteDossierFacades.new params[:id].to_i, current_user.email
|
invite = Invite.where(email: current_user.email, id: params[:id].to_i).first!
|
||||||
|
dossier = invite.dossier
|
||||||
|
|
||||||
if @facade.dossier.brouillon?
|
if dossier.brouillon?
|
||||||
redirect_to brouillon_dossier_path(@facade.dossier)
|
redirect_to brouillon_dossier_path(dossier)
|
||||||
else
|
else
|
||||||
return redirect_to dossier_path(@facade.dossier)
|
redirect_to dossier_path(dossier)
|
||||||
end
|
end
|
||||||
rescue ActiveRecord::RecordNotFound
|
rescue ActiveRecord::RecordNotFound
|
||||||
flash.alert = t('errors.messages.dossier_not_found')
|
flash.alert = t('errors.messages.dossier_not_found')
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
class InviteDossierFacades < DossierFacades
|
|
||||||
# TODO rechercher en fonction de la personne/email
|
|
||||||
def initialize(id, email)
|
|
||||||
@dossier = Invite.where(email: email, id: id).first!.dossier
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
namespace :after_party do
|
||||||
|
desc 'Deployment task: remove_invite_gestionnaires'
|
||||||
|
task remove_invite_gestionnaires: :environment do
|
||||||
|
InviteGestionnaire.destroy_all
|
||||||
|
|
||||||
|
# Update task as completed. If you remove the line below, the task will
|
||||||
|
# run with every deploy (or every time you call after_party:run).
|
||||||
|
AfterParty::TaskRecord.create version: '20181010102500'
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue