DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Cleanup Procedure retrieval in “Commencer”

Browse source 
Make sure to only fetch active (brouillons or published) procedures.
This commit is contained in:
Nicolas Bouilleaud 2019-07-05 10:37:29 +02:00
parent 92e6032115
commit 99f986b815
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/controllers/users/commencer_controller.rb
View file

@ -3,21 +3,21 @@ module Users
layout 'procedure_context' layout 'procedure_context'
def commencer def commencer
@procedure = Procedure.publiees.find_by(path: params[:path]) @procedure = retrieve_procedure
return procedure_not_found if @procedure.blank? return procedure_not_found if @procedure.blank? || @procedure.brouillon?
render 'commencer/show' render 'commencer/show'
end end
def commencer_test def commencer_test
@procedure = Procedure.brouillons.find_by(path: params[:path]) @procedure = retrieve_procedure
return procedure_not_found if @procedure.blank? return procedure_not_found if @procedure.blank? || @procedure.publiee?
render 'commencer/show' render 'commencer/show'
end end
def sign_in def sign_in
@procedure = Procedure.find_by(path: params[:path]) @procedure = retrieve_procedure
return procedure_not_found if @procedure.blank? return procedure_not_found if @procedure.blank?
store_user_location!(@procedure) store_user_location!(@procedure)
@ -25,7 +25,7 @@ module Users
end end
def sign_up def sign_up
@procedure = Procedure.find_by(path: params[:path]) @procedure = retrieve_procedure
return procedure_not_found if @procedure.blank? return procedure_not_found if @procedure.blank?
store_user_location!(@procedure) store_user_location!(@procedure)
@ -33,7 +33,7 @@ module Users
end end
def france_connect def france_connect
@procedure = Procedure.find_by(path: params[:path]) @procedure = retrieve_procedure
return procedure_not_found if @procedure.blank? return procedure_not_found if @procedure.blank?
store_user_location!(@procedure) store_user_location!(@procedure)
@ -41,23 +41,25 @@ module Users
end end
def procedure_for_help def procedure_for_help
Procedure.publiees.find_by(path: params[:path]) || Procedure.brouillons.find_by(path: params[:path]) retrieve_procedure
end end
private private
def retrieve_procedure
Procedure.publiees.or(Procedure.brouillons).find_by(path: params[:path])
end
def procedure_not_found def procedure_not_found
procedure = Procedure.find_by(path: params[:path]) procedure = Procedure.find_by(path: params[:path])
if procedure&.archivee? if procedure&.archivee?
flash.alert = t('errors.messages.procedure_archived') flash.alert = t('errors.messages.procedure_archived')
elsif procedure&.publiee?
flash.alert = t('errors.messages.procedure_not_draft')
else else
flash.alert = t('errors.messages.procedure_not_found') flash.alert = t('errors.messages.procedure_not_found')
end end
return redirect_to root_path redirect_to root_path
end end
def store_user_location!(procedure) def store_user_location!(procedure)