diff options
| author | Zog | 2018-04-18 09:59:15 +0200 |
|---|---|---|
| committer | Johan Van Ryseghem | 2018-04-27 11:17:19 +0200 |
| commit | 0046e5a01cb08c10118b01c50f3c52d159854ef0 (patch) | |
| tree | 6e690461a9266716d31f14611235eab9f1f76e33 /app/models/merge.rb | |
| parent | 681f874e3150c35b03e74b25827b74791ae9ae95 (diff) | |
| download | chouette-core-0046e5a01cb08c10118b01c50f3c52d159854ef0.tar.bz2 | |
Refs #6572; Use new states
Diffstat (limited to 'app/models/merge.rb')
| -rw-r--r-- | app/models/merge.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb index be1bbedcb..2824e1f83 100644 --- a/app/models/merge.rb +++ b/app/models/merge.rb @@ -39,10 +39,14 @@ class Merge < ApplicationModel rescue => e Rails.logger.error "Merge failed: #{e} #{e.backtrace.join("\n")}" update status: :failed + new&.failed! raise e if Rails.env.test? ensure attributes = { ended_at: Time.now } - attributes[:status] = :successful if status == :running + if status == :running + attributes[:status] = :successful + referentials.each &:archived! + end update attributes end |