aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorLuc Donnet2017-09-04 11:09:37 +0200
committerLuc Donnet2017-09-04 11:09:37 +0200
commitebd54ae20d5e5bcd4ccc269bca46374a802821a7 (patch)
tree3c42a74ce07b360bd930ec40fa7ec3aa96ad4634 /app/models
parentdd3ec3c6090b05a0a910b278f51ff7b5d8a92f02 (diff)
parent49eec9d3d8ed4e23b1a12b21f88411fb388fa2da (diff)
downloadchouette-core-ebd54ae20d5e5bcd4ccc269bca46374a802821a7.tar.bz2
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'app/models')
-rw-r--r--app/models/referential.rb5
-rw-r--r--app/models/referential_metadata.rb3
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/referential.rb b/app/models/referential.rb
index cb2c7b23b..ecfc69c4a 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -130,7 +130,7 @@ class Referential < ActiveRecord::Base
self
end
- def self.new_from(from)
+ def self.new_from(from, functional_scope)
Referential.new(
name: I18n.t("activerecord.copy", :name => from.name),
slug: "#{from.slug}_clone",
@@ -139,9 +139,8 @@ class Referential < ActiveRecord::Base
bounds: from.bounds,
line_referential: from.line_referential,
stop_area_referential: from.stop_area_referential,
- workbench: from.workbench,
created_from: from,
- metadatas: from.metadatas.map { |m| ReferentialMetadata.new_from(m) }
+ metadatas: from.metadatas.map { |m| ReferentialMetadata.new_from(m, functional_scope) }
)
end
diff --git a/app/models/referential_metadata.rb b/app/models/referential_metadata.rb
index b774072c7..839a937f4 100644
--- a/app/models/referential_metadata.rb
+++ b/app/models/referential_metadata.rb
@@ -155,8 +155,9 @@ class ReferentialMetadata < ActiveRecord::Base
end
private :clear_periods
- def self.new_from from
+ def self.new_from(from, functional_scope)
from.dup.tap do |metadata|
+ metadata.line_ids = from.referential.lines.where(id: metadata.line_ids, objectid: functional_scope).collect(&:id)
metadata.referential_id = nil
end
end