aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/merge.rb
diff options
context:
space:
mode:
authorAlban Peignier2018-04-15 22:04:06 +0200
committerAlban Peignier2018-04-15 22:04:06 +0200
commit3790cb1fe774579c09b37005b7955120b610a865 (patch)
tree423164f992dd8bc118f9d3c951a5a4170e660e82 /app/models/merge.rb
parentdbecff41f8db17c2eb37fcb28a2a30b25d9a3738 (diff)
downloadchouette-core-3790cb1fe774579c09b37005b7955120b610a865.tar.bz2
Change Referential.new_from invocation in Merge#prepare_new. Refs #6535
Diffstat (limited to 'app/models/merge.rb')
-rw-r--r--app/models/merge.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb
index 6e2a7036a..a608f9935 100644
--- a/app/models/merge.rb
+++ b/app/models/merge.rb
@@ -50,7 +50,7 @@ class Merge < ApplicationModel
new =
if workbench.output.current
Rails.logger.debug "Clone current output"
- Referential.new_from(workbench.output.current, fixme_functional_scope).tap do |clone|
+ Referential.new_from(workbench.output.current, workbench.organisation).tap do |clone|
clone.inline_clone = true
end
else