[fix #504] Dossier: draft -> brouillon
This commit is contained in:
parent
56545933a9
commit
72bae2c374
34 changed files with 93 additions and 89 deletions
|
@ -39,18 +39,18 @@ class Users::DescriptionController < UsersController
|
|||
errors_upload = PiecesJustificativesService.upload!(dossier, current_user, params)
|
||||
return redirect_to_description_with_errors(dossier, errors_upload) if errors_upload.any?
|
||||
|
||||
if params[:champs] && !draft_submission?
|
||||
if params[:champs] && !brouillon_submission?
|
||||
errors =
|
||||
ChampsService.build_error_messages(dossier.champs) +
|
||||
PiecesJustificativesService.missing_pj_error_messages(dossier)
|
||||
return redirect_to_description_with_errors(dossier, errors) if errors.any?
|
||||
end
|
||||
|
||||
if draft_submission?
|
||||
if brouillon_submission?
|
||||
flash.notice = 'Votre brouillon a bien été sauvegardé.'
|
||||
redirect_to url_for(controller: :dossiers, action: :index, liste: :brouillon)
|
||||
else
|
||||
if dossier.draft?
|
||||
if dossier.brouillon?
|
||||
NotificationMailer.send_notification(dossier, procedure.initiated_mail_template).deliver_now!
|
||||
dossier.en_construction!
|
||||
end
|
||||
|
@ -93,7 +93,7 @@ class Users::DescriptionController < UsersController
|
|||
|
||||
def self.route_authorization
|
||||
{
|
||||
states: [:draft, :en_construction]
|
||||
states: [:brouillon, :en_construction]
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -110,7 +110,7 @@ class Users::DescriptionController < UsersController
|
|||
redirect_to users_dossier_description_path(dossier_id: dossier.id)
|
||||
end
|
||||
|
||||
def draft_submission?
|
||||
def brouillon_submission?
|
||||
params[:submit] && params[:submit].keys.first == 'brouillon'
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue