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

stop using get_liste_piece_jointe

Browse source
This commit is contained in:
Tanguy PATTE 2015-08-17 11:42:41 +02:00
parent bf0164b4c7
commit 3a92e727ed
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/dossier_controller.rb
View file

@ -11,7 +11,7 @@ class Admin::DossierController < ApplicationController
@commentaire_email = current_user.email @commentaire_email = current_user.email
@formulaire = @dossier.formulaire @formulaire = @dossier.formulaire
@liste_pieces_jointes = TypePieceJointe.get_liste_piece_jointe @dossier.formulaire @liste_pieces_jointes = @dossier.types_piece_jointe
@array_id_pj_valides = PieceJointe.get_array_id_pj_valid_for_dossier @dossier.id @array_id_pj_valides = PieceJointe.get_array_id_pj_valid_for_dossier @dossier.id
@dossier = @dossier.decorate @dossier = @dossier.decorate
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound

11
app/controllers/description_controller.rb
View file

@ -4,7 +4,8 @@ class DescriptionController < ApplicationController
@dossier = @dossier.decorate @dossier = @dossier.decorate
@array_id_pj_valides = PieceJointe.get_array_id_pj_valid_for_dossier @dossier.id @array_id_pj_valides = PieceJointe.get_array_id_pj_valid_for_dossier @dossier.id
@liste_pieces_jointes = get_liste_piece_jointe @formulaire = @dossier.formulaire
@liste_pieces_jointes = @dossier.types_piece_jointe
rescue rescue
redirect_to url_for({controller: :start, action: :error_dossier}) redirect_to url_for({controller: :start, action: :error_dossier})
end end
@ -28,7 +29,8 @@ class DescriptionController < ApplicationController
@piece_jointe.save @piece_jointe.save
end end
get_liste_piece_jointe.each do |pj|
@dossier.types_piece_jointe.each do |pj|
if params["piece_jointe_#{pj.id}"] != nil if params["piece_jointe_#{pj.id}"] != nil
PieceJointe.destroy_all(dossier_id: @dossier.id, type_piece_jointe_id: pj.id) PieceJointe.destroy_all(dossier_id: @dossier.id, type_piece_jointe_id: pj.id)
@ -70,9 +72,4 @@ class DescriptionController < ApplicationController
def check_format_email email def check_format_email email
/\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/.match(email) /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/.match(email)
end end
def get_liste_piece_jointe
@formulaire = @dossier.formulaire
TypePieceJointe.where ("\"CERFA\" = '#{@formulaire.demarche_id}'")
end
end end