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

Correctly handle errors when cloning someone else’s procedure

Browse source
This commit is contained in:
gregoirenovel 2018-01-08 15:43:41 +01:00
parent a1275af55f
commit c77558aeed
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/admin/procedures_controller.rb
View file

@ -165,10 +165,15 @@ class Admin::ProceduresController < AdminController
if new_procedure.save if new_procedure.save
flash.notice = 'Procédure clonée' flash.notice = 'Procédure clonée'
redirect_to edit_admin_procedure_path(id: new_procedure.id) redirect_to edit_admin_procedure_path(id: new_procedure.id)
else
if params[:from_new_from_existing].present?
flash.alert = new_procedure.errors.full_messages
redirect_to new_from_existing_admin_procedures_path
else else
flash.now.alert = new_procedure.errors.full_messages flash.now.alert = new_procedure.errors.full_messages
render 'index' render 'index'
end end
end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
flash.alert = 'Procédure inexistante' flash.alert = 'Procédure inexistante'

2
app/views/admin/procedures/new_from_existing.html.haml
View file

@ -18,4 +18,4 @@
- if !procedure.archivee? - if !procedure.archivee?
= link_to('Tester', commencer_path(procedure_path: procedure.path), target: "_blank") = link_to('Tester', commencer_path(procedure_path: procedure.path), target: "_blank")
%td %td
= link_to('Cloner', admin_procedure_clone_path(procedure.id), 'data-method' => :put, class: 'btn-sm btn-primary clone-btn') = link_to('Cloner', admin_procedure_clone_path(procedure.id, from_new_from_existing: true), 'data-method' => :put, class: 'btn-sm btn-primary clone-btn')