From 19b58a298cb5094e31abd5cdd2852fe69934021f Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 7 Mar 2018 17:42:31 +0100 Subject: [PATCH] Clarify dependent relationships between etablissement and entreprise --- app/models/dossier.rb | 1 - app/models/entreprise.rb | 2 +- app/models/etablissement.rb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 9772d1bc5..e561d3fd3 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -181,7 +181,6 @@ class Dossier < ApplicationRecord def reset! etablissement.destroy - entreprise.destroy update_columns(autorisation_donnees: false) end diff --git a/app/models/entreprise.rb b/app/models/entreprise.rb index 57057b52d..3403c10c9 100644 --- a/app/models/entreprise.rb +++ b/app/models/entreprise.rb @@ -1,6 +1,6 @@ class Entreprise < ApplicationRecord belongs_to :dossier - has_one :etablissement, dependent: :destroy + has_one :etablissement has_one :rna_information, dependent: :destroy validates :siren, presence: true diff --git a/app/models/etablissement.rb b/app/models/etablissement.rb index 2b718f035..17f2b81a4 100644 --- a/app/models/etablissement.rb +++ b/app/models/etablissement.rb @@ -1,6 +1,6 @@ class Etablissement < ApplicationRecord belongs_to :dossier - belongs_to :entreprise + belongs_to :entreprise, dependent: :destroy has_many :exercices, dependent: :destroy