fix(merge_fork): un dossier etant sur une revision passee avec une repetition qui a ete supprimée peut merge_fork

This commit is contained in:
Martin 2023-06-30 14:26:04 +02:00
parent 5c9101d15f
commit d4f4998999

View file

@ -172,6 +172,9 @@ module DossierCloneConcern
champs_to_remove += diff[:removed] champs_to_remove += diff[:removed]
champs_to_remove champs_to_remove
.filter { !_1.child? || !champs_to_remove.include?(_1.parent) } .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
end end