aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/referential.rb1
-rw-r--r--app/models/workbench.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 8087ea61e..8391a8b00 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -61,6 +61,7 @@ class Referential < ActiveRecord::Base
scope :include_metadatas_lines, ->(line_ids) { where('referential_metadata.line_ids && ARRAY[?]::bigint[]', line_ids) }
scope :order_by_validity_period, ->(dir) { joins(:metadatas).order("unnest(periodes) #{dir}") }
scope :order_by_lines, ->(dir) { joins(:metadatas).group("referentials.id").order("sum(array_length(referential_metadata.line_ids,1)) #{dir}") }
+ scope :not_in_referential_suite, -> { where referential_suite_id: nil }
def save_with_table_lock_timeout(options = {})
save_without_table_lock_timeout(options)
diff --git a/app/models/workbench.rb b/app/models/workbench.rb
index 3c522ce82..3190246ae 100644
--- a/app/models/workbench.rb
+++ b/app/models/workbench.rb
@@ -30,7 +30,7 @@ class Workbench < ActiveRecord::Base
if line_ids.empty?
Referential.none
else
- Referential.joins(:metadatas).where(['referential_metadata.line_ids && ARRAY[?]::bigint[]', line_ids]).ready
+ Referential.joins(:metadatas).where(['referential_metadata.line_ids && ARRAY[?]::bigint[]', line_ids]).ready.not_in_referential_suite
end
end