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

Merge pull request #9738 from colinux/validate-pending-correction

Browse source 
ETQ usager modifiant un dossier en construction je n'ai plus besoin de cocher la case de correction effectuée
This commit is contained in:
Colin Darie 2023-11-27 13:52:06 +00:00 • committed by GitHub
commit 15ff65429b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 175 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/controllers/users/dossiers_controller.rb
View file

@ -250,19 +250,23 @@ module Users
def submit_en_construction
@dossier = dossier_with_champs(pj_template: false)
editing_fork_origin = @dossier.editing_fork_origin
if cast_bool(params.dig(:dossier, :pending_correction))
editing_fork_origin.resolve_pending_correction
end
@errors = submit_dossier_and_compute_errors
if @errors.blank?
pending_correction_confirm = cast_bool(params.dig(:dossier, :pending_correction_confirm))
editing_fork_origin = @dossier.editing_fork_origin
editing_fork_origin.merge_fork(@dossier)
editing_fork_origin.submit_en_construction!(pending_correction_confirm:)
editing_fork_origin.submit_en_construction!
redirect_to dossier_path(editing_fork_origin)
else
respond_to do |format|
format.html do
@dossier = @dossier.editing_fork_origin
@dossier = editing_fork_origin
render :modifier
end
@ -537,10 +541,18 @@ module Users
@dossier.validate(:champs_public_value)
errors = @dossier.errors
@dossier.check_mandatory_and_visible_champs.map do |error_on_champ|
@dossier.check_mandatory_and_visible_champs.each do |error_on_champ|
errors.import(error_on_champ)
end
if @dossier.editing_fork_origin&.pending_correction?
@dossier.editing_fork_origin.validate(:champs_public_value)
@dossier.editing_fork_origin.errors.where(:pending_correction).each do |error|
errors.import(error)
end
end
errors
end