diff options
| author | Alban Peignier | 2018-01-11 21:43:22 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-01-11 22:03:34 +0100 |
| commit | 13de613c6db20e32f58ca16b5b3c58e79b5e8d70 (patch) | |
| tree | 99334c94543e6d7f13301b175dd3de48352a47fc /app/models/merge.rb | |
| parent | 1fd6d7d0cfb63b024860d1c29fca089432fce2e1 (diff) | |
| download | chouette-core-13de613c6db20e32f58ca16b5b3c58e79b5e8d70.tar.bz2 | |
Add Referential#merged_at and make Referentials archived and merged. Refs #5559
Diffstat (limited to 'app/models/merge.rb')
| -rw-r--r-- | app/models/merge.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb index 26bd5398b..eebf1d2e1 100644 --- a/app/models/merge.rb +++ b/app/models/merge.rb @@ -360,6 +360,8 @@ class Merge < ActiveRecord::Base def save_current output.update current: new, new: nil output.current.update referential_suite: output + + referentials.update_all merged_at: created_at, archived_at: created_at end def fixme_functional_scope |