Update filter editable scope

slovensko-digital · Sep 16, 2024 · 6afd341 · 6afd341
1 parent ab4b919
commit 6afd341
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/models/filter.rb b/app/models/filter.rb
@@ -30,6 +30,9 @@ class Filter < ApplicationRecord
 
   scope :pinned, -> { where(is_pinned: true) }
   scope :not_pinned, -> { where(is_pinned: false) }
+  scope :visible_for, -> (user) { joins(:user_filter_visibilities)
+    .where(user_filter_visibilities: { visible: true, user: user})
+    .where(is_pinned: false) }
 
   acts_as_list scope: :tenant_id
 

diff --git a/app/policies/filter_policy.rb b/app/policies/filter_policy.rb
@@ -10,7 +10,7 @@ def initialize(user, filter)
 
   class ScopeEditable < Scope
     def resolve
-      scoped = scope.where(tenant_id: Current.tenant)
+      scoped = scope.where(tenant_id: Current.tenant).visible_for(@user)
 
       return scoped if @user.admin?