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

DescriptionController: simplify update logic

Browse source
This commit is contained in:
Simon Lehericey 2017-04-10 11:45:16 +02:00
parent 3a9065e4c1
commit 191b29aff5
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/users/description_controller.rb
View file

@ -35,7 +35,7 @@ class Users::DescriptionController < UsersController
@champs = @dossier.ordered_champs
check_mandatory_fields = true
check_mandatory_fields = !(params[:submit].keys.first == 'brouillon') unless params[:submit].nil?
check_mandatory_fields = !(params[:submit].keys.first == 'brouillon') if params[:submit]
if params[:champs]
champs_service_errors = ChampsService.save_champs @dossier.champs,
@ -48,22 +48,20 @@ class Users::DescriptionController < UsersController
end
end
if @procedure.cerfa_flag?
unless params[:cerfa_pdf].nil?
cerfa = Cerfa.new(content: params[:cerfa_pdf], dossier: @dossier, user: current_user)
unless cerfa.save
flash.alert = cerfa.errors.full_messages.join('<br />').html_safe
return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
end
if @procedure.cerfa_flag? && params[:cerfa_pdf]
cerfa = Cerfa.new(content: params[:cerfa_pdf], dossier: @dossier, user: current_user)
unless cerfa.save
flash.alert = cerfa.errors.full_messages.join('<br />').html_safe
return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
end
end
unless (errors_upload = PiecesJustificativesService.upload!(@dossier, current_user, params)).empty?
errors_upload = PiecesJustificativesService.upload!(@dossier, current_user, params)
unless errors_upload.empty?
flash.alert = errors_upload.html_safe
return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
end
if check_mandatory_fields
if @dossier.draft?
@dossier.initiated!