aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-01-14 23:09:50 +0100
committerAlban Peignier2018-01-14 23:14:37 +0100
commitaf4bc2d567781883fa6a1de6858e2b66726eb49d (patch)
tree7468cfc191edc3bc3ff3ee45b0314a3d3d73a41d
parentf46940936595f0d0b7eeff76175220ca3ee9d512 (diff)
downloadchouette-core-af4bc2d567781883fa6a1de6858e2b66726eb49d.tar.bz2
Define Referential#workbench in Merge. Refs #5587
-rw-r--r--app/models/merge.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb
index eebf1d2e1..91be27f2c 100644
--- a/app/models/merge.rb
+++ b/app/models/merge.rb
@@ -60,6 +60,7 @@ class Merge < ActiveRecord::Base
end
new.referential_suite = output
+ new.workbench = workbench
new.organisation = workbench.organisation
new.slug = "output_#{workbench.id}_#{created_at.to_i}"
new.name = I18n.t("merges.referential_name", date: I18n.l(created_at))