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

Merge pull request #680 from sgmap/workaround_preview_issue

Browse source 
Dossier: workaround preview bug linked to champs with dossier.id == 0
This commit is contained in:
gregoirenovel 2017-08-29 16:38:51 +02:00 committed by GitHub
commit 32e08bea82
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/dossier.rb
View file

@ -121,11 +121,15 @@ class Dossier < ActiveRecord::Base
end
def ordered_champs
champs.includes(:type_de_champ).order('types_de_champ.order_place')
# TODO: use the line below when the procedure preview does not leak champ with dossier_id == 0
# champs.joins(:type_de_champ).order('types_de_champ.order_place')
champs.joins(', types_de_champ').where("champs.type_de_champ_id = types_de_champ.id AND types_de_champ.procedure_id = #{procedure.id}").order('order_place')
end
def ordered_champs_private
champs_private.includes(:type_de_champ).order('types_de_champ.order_place')
# TODO: use the line below when the procedure preview does not leak champ with dossier_id == 0
# champs_private.includes(:type_de_champ).order('types_de_champ.order_place')
champs_private.joins(', types_de_champ').where("champs.type_de_champ_id = types_de_champ.id AND types_de_champ.procedure_id = #{procedure.id}").order('order_place')
end
def ordered_pieces_justificatives