From d4f4998999adba6eac04920b53ef57c99a5e86e8 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Fri, 30 Jun 2023 14:26:04 +0200
Subject: [PATCH] =?UTF-8?q?fix(merge=5Ffork):=20un=20dossier=20etant=20sur?=
 =?UTF-8?q?=20une=20revision=20passee=20avec=20une=20repetition=20qui=20a?=
 =?UTF-8?q?=20ete=20supprim=C3=A9e=20peut=20merge=5Ffork?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/concerns/dossier_clone_concern.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/dossier_clone_concern.rb b/app/models/concerns/dossier_clone_concern.rb
index b5987cdec..5c02ea731 100644
--- a/app/models/concerns/dossier_clone_concern.rb
+++ b/app/models/concerns/dossier_clone_concern.rb
@@ -172,6 +172,9 @@ module DossierCloneConcern
     champs_to_remove += diff[:removed]
     champs_to_remove
       .filter { !_1.child? || !champs_to_remove.include?(_1.parent) }
-      .each(&:destroy!)
+      .each do |champ|
+        champ.rows.flatten.each(&:destroy!) if champ.repetition?
+        champ.destroy!
+      end
   end
 end