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

Suppression des decorates pour établissement

Browse source
This commit is contained in:
Xavier J 2015-08-11 15:38:34 +02:00
parent d09ac6043c
commit 77fe251d8a
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ class Admin::DossierController < ApplicationController
def show
@dossier = Dossier.find(params[:dossier_id])
@entreprise = @dossier.entreprise.decorate
@etablissement = @dossier.etablissement.decorate
@etablissement = @dossier.etablissement
@dossier_pdf = @dossier.dossier_pdf
@commentaires = @dossier.commentaires.order(created_at: :desc)

4
app/controllers/dossiers_controller.rb
View file

@ -2,7 +2,7 @@ class DossiersController < ApplicationController
def show
@dossier = Dossier.find(params[:id])
@etablissement = @dossier.etablissement.decorate
@etablissement = @dossier.etablissement
@entreprise = @dossier.entreprise.decorate
rescue
redirect_to url_for({controller: :start, action: :error_dossier})
@ -51,7 +51,7 @@ class DossiersController < ApplicationController
if @dossier.autorisation_donnees
redirect_to url_for({controller: :demandes, action: :show, dossier_id: @dossier.id})
else
@etablissement = @dossier.etablissement.decorate
@etablissement = @dossier.etablissement
@entreprise = @dossier.entreprise.decorate
self.error

1
db/seeds.rb
View file

@ -28,5 +28,4 @@ User.create({
@entreprise = Entreprise.create({id: 10000, siren: 431449040, date_creation: 1437665347, dossier: @dossier, raison_sociale: 'Coucou', code_effectif_entreprise: '00'})
@etablissement = Etablissement.create({id: 10000, siret: 43144904000028, siege_social: true, adresse: '50 avenue des champs élysées Paris 75008', entreprise: @entreprise, dossier: @dossier})
Commentaire.create({email: 'test@test.com', body: 'Commentaire de test', dossier: @dossier})