aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/merge.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge.rb')
-rw-r--r--app/models/merge.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb
index aca2f4d4d..f4111c3fa 100644
--- a/app/models/merge.rb
+++ b/app/models/merge.rb
@@ -35,6 +35,8 @@ class Merge < ApplicationModel
merge_referential referential
end
+ clean_new
+
save_current
rescue => e
Rails.logger.error "Merge failed: #{e} #{e.backtrace.join("\n")}"
@@ -83,6 +85,10 @@ class Merge < ApplicationModel
@new = new
end
+ def clean_new
+ CleanUp.new(referential: new, methods: [:destroy_empty]).clean
+ end
+
def merge_referential(referential)
Rails.logger.debug "Merge #{referential.slug}"