From f9ec384b8bfac2788eeadb67ea71c2bd2d7edf45 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Wed, 16 Nov 2016 15:53:24 +0100 Subject: ReferentialMetadata scope include_lines && include_dateranges Refs #1864 --- app/models/referential_metadata.rb | 4 +++- app/models/workbench.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/referential_metadata.rb b/app/models/referential_metadata.rb index 57ef9f7ca..5cd0ed22b 100644 --- a/app/models/referential_metadata.rb +++ b/app/models/referential_metadata.rb @@ -1,9 +1,11 @@ class ReferentialMetadata < ActiveRecord::Base belongs_to :referential belongs_to :referential_source, class_name: 'Referential' - has_array_of :lines, class_name: 'Chouette::Line' + scope :include_lines, -> (line_ids) { where('line_ids && ARRAY[?]', line_ids) } + scope :include_dateranges, -> (dateranges) { where('periodes && ARRAY[?]', dateranges) } + def self.new_from from ReferentialMetadata.new({ referential_source: from.referential_source, diff --git a/app/models/workbench.rb b/app/models/workbench.rb index a83fea70d..b5ab37222 100644 --- a/app/models/workbench.rb +++ b/app/models/workbench.rb @@ -13,5 +13,5 @@ class Workbench < ActiveRecord::Base validates :organisation, presence: true has_many :referentials - + has_many :referential_metadatas, through: :referentials end -- cgit v1.2.3