From a052d46f967ad506340592b31fb58d4ae0db8471 Mon Sep 17 00:00:00 2001 From: James Smith Date: Thu, 27 Feb 2025 10:26:30 +0000 Subject: [PATCH] remove use of #all in policy scopes --- app/policies/acts_as_taggable_on/tag_policy.rb | 2 +- app/policies/acts_as_taggable_on/tagging_policy.rb | 2 +- app/policies/application_policy.rb | 2 +- app/policies/link_policy.rb | 2 +- app/policies/problem_policy.rb | 2 +- app/policies/user_policy.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/policies/acts_as_taggable_on/tag_policy.rb b/app/policies/acts_as_taggable_on/tag_policy.rb index 53f5a0ac9..4d5624153 100644 --- a/app/policies/acts_as_taggable_on/tag_policy.rb +++ b/app/policies/acts_as_taggable_on/tag_policy.rb @@ -10,7 +10,7 @@ class ActsAsTaggableOn::TagPolicy < ApplicationPolicy end def resolve - scope.all + scope end end end diff --git a/app/policies/acts_as_taggable_on/tagging_policy.rb b/app/policies/acts_as_taggable_on/tagging_policy.rb index 9176bdba4..745462904 100644 --- a/app/policies/acts_as_taggable_on/tagging_policy.rb +++ b/app/policies/acts_as_taggable_on/tagging_policy.rb @@ -10,7 +10,7 @@ class ActsAsTaggableOn::TaggingPolicy < ApplicationPolicy end def resolve - scope.all + scope end end end diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index ffca89fef..87709e200 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -61,7 +61,7 @@ class ApplicationPolicy end def resolve - return scope.all if user&.is_moderator? || !scope.respond_to?(:granted_to) + return scope if user&.is_moderator? || !scope.respond_to?(:granted_to) result = scope.granted_to(["view", "edit", "own"], [user, nil]) result = result.or(scope.granted_to(["view", "edit", "own"], user.roles)) if user diff --git a/app/policies/link_policy.rb b/app/policies/link_policy.rb index 422269248..1abdcb61f 100644 --- a/app/policies/link_policy.rb +++ b/app/policies/link_policy.rb @@ -8,7 +8,7 @@ class LinkPolicy < ApplicationPolicy end def resolve - scope.all + scope end end end diff --git a/app/policies/problem_policy.rb b/app/policies/problem_policy.rb index a61c6f41e..ff83aeb84 100644 --- a/app/policies/problem_policy.rb +++ b/app/policies/problem_policy.rb @@ -13,7 +13,7 @@ class ProblemPolicy < ApplicationPolicy class Scope < ApplicationPolicy::Scope def resolve - scope.all + scope end end end diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index 3a2787e38..0601df4dc 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -59,7 +59,7 @@ class UserPolicy < ApplicationPolicy end def resolve - scope.all + scope end end end