Merge pull request #247 from af83/5592-workbenches-show--filter-by-workgroup-on-initial-load

5592 workbenches show  filter by workgroup on initial load

2 files changed, 7 insertions, 1 deletions

diff --git a/app/models/workbench.rb b/app/models/workbench.rb
index f49f4e7cf..b80fa64ac 100644
--- a/app/models/workbench.rb
+++ b/app/models/workbench.rb
@@ -31,7 +31,12 @@ class Workbench < ActiveRecord::Base
     if line_ids.empty?
       Referential.none
     else
-      Referential.joins(:metadatas).where(['referential_metadata.line_ids && ARRAY[?]::bigint[]', line_ids]).ready.not_in_referential_suite
+      workgroup
+        .referentials
+        .joins(:metadatas)
+        .where(['referential_metadata.line_ids && ARRAY[?]::bigint[]', line_ids])
+        .ready
+        .not_in_referential_suite
     end
   end
 
diff --git a/app/models/workgroup.rb b/app/models/workgroup.rb
index 511bbfeb0..3d761e81f 100644
--- a/app/models/workgroup.rb
+++ b/app/models/workgroup.rb
@@ -4,6 +4,7 @@ class Workgroup < ActiveRecord::Base
 
   has_many :workbenches
   has_many :organisations, through: :workbenches
+  has_many :referentials, through: :workbenches
 
   validates_uniqueness_of :name