Use consistent style in *Filter classes to skip pagination (#38559)
This commit is contained in:
parent
f2f07404b5
commit
9fdc8246f2
@ -14,6 +14,8 @@ class AccountFilter
|
|||||||
order
|
order
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
|
IGNORED_PARAMS = %w(page).freeze
|
||||||
|
|
||||||
attr_reader :params
|
attr_reader :params
|
||||||
|
|
||||||
def initialize(params)
|
def initialize(params)
|
||||||
@ -24,7 +26,7 @@ class AccountFilter
|
|||||||
scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor
|
scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor
|
||||||
|
|
||||||
relevant_params.each do |key, value|
|
relevant_params.each do |key, value|
|
||||||
next if key.to_s == 'page'
|
next if IGNORED_PARAMS.include?(key.to_s)
|
||||||
|
|
||||||
scope.merge!(scope_for(key, value)) if value.present?
|
scope.merge!(scope_for(key, value)) if value.present?
|
||||||
end
|
end
|
||||||
|
|||||||
@ -82,6 +82,8 @@ class Admin::ActionLogFilter
|
|||||||
destroy_username_block: { target_type: 'UsernameBlock', action: 'destroy' }.freeze,
|
destroy_username_block: { target_type: 'UsernameBlock', action: 'destroy' }.freeze,
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
|
IGNORED_PARAMS = %w(page).freeze
|
||||||
|
|
||||||
attr_reader :params
|
attr_reader :params
|
||||||
|
|
||||||
def initialize(params)
|
def initialize(params)
|
||||||
@ -92,7 +94,7 @@ class Admin::ActionLogFilter
|
|||||||
scope = latest_action_logs.includes(:target, :account)
|
scope = latest_action_logs.includes(:target, :account)
|
||||||
|
|
||||||
params.each do |key, value|
|
params.each do |key, value|
|
||||||
next if key.to_s == 'page'
|
next if IGNORED_PARAMS.include?(key.to_s)
|
||||||
|
|
||||||
scope.merge!(scope_for(key.to_s, value.to_s.strip)) if value.present?
|
scope.merge!(scope_for(key.to_s, value.to_s.strip)) if value.present?
|
||||||
end
|
end
|
||||||
|
|||||||
@ -7,6 +7,8 @@ class Admin::TagFilter
|
|||||||
order
|
order
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
|
IGNORED_PARAMS = %w(page).freeze
|
||||||
|
|
||||||
attr_reader :params
|
attr_reader :params
|
||||||
|
|
||||||
def initialize(params)
|
def initialize(params)
|
||||||
@ -17,7 +19,7 @@ class Admin::TagFilter
|
|||||||
scope = Tag.all
|
scope = Tag.all
|
||||||
|
|
||||||
params.each do |key, value|
|
params.each do |key, value|
|
||||||
next if key == :page
|
next if IGNORED_PARAMS.include?(key.to_s)
|
||||||
|
|
||||||
scope.merge!(scope_for(key, value)) if value.present?
|
scope.merge!(scope_for(key, value)) if value.present?
|
||||||
end
|
end
|
||||||
|
|||||||
@ -6,6 +6,8 @@ class AnnouncementFilter
|
|||||||
unpublished
|
unpublished
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
|
IGNORED_PARAMS = %w(page).freeze
|
||||||
|
|
||||||
attr_reader :params
|
attr_reader :params
|
||||||
|
|
||||||
def initialize(params)
|
def initialize(params)
|
||||||
@ -16,7 +18,7 @@ class AnnouncementFilter
|
|||||||
scope = Announcement.unscoped
|
scope = Announcement.unscoped
|
||||||
|
|
||||||
params.each do |key, value|
|
params.each do |key, value|
|
||||||
next if key.to_s == 'page'
|
next if IGNORED_PARAMS.include?(key.to_s)
|
||||||
|
|
||||||
scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
|
scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
|
||||||
end
|
end
|
||||||
|
|||||||
@ -8,6 +8,8 @@ class CustomEmojiFilter
|
|||||||
shortcode
|
shortcode
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
|
IGNORED_PARAMS = %w(page).freeze
|
||||||
|
|
||||||
attr_reader :params
|
attr_reader :params
|
||||||
|
|
||||||
def initialize(params)
|
def initialize(params)
|
||||||
@ -18,7 +20,7 @@ class CustomEmojiFilter
|
|||||||
scope = CustomEmoji.alphabetic
|
scope = CustomEmoji.alphabetic
|
||||||
|
|
||||||
params.each do |key, value|
|
params.each do |key, value|
|
||||||
next if key.to_s == 'page'
|
next if IGNORED_PARAMS.include?(key.to_s)
|
||||||
|
|
||||||
scope.merge!(scope_for(key, value)) if value.present?
|
scope.merge!(scope_for(key, value)) if value.present?
|
||||||
end
|
end
|
||||||
|
|||||||
@ -5,6 +5,8 @@ class Trends::PreviewCardProviderFilter
|
|||||||
status
|
status
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
|
IGNORED_PARAMS = %w(page).freeze
|
||||||
|
|
||||||
attr_reader :params
|
attr_reader :params
|
||||||
|
|
||||||
def initialize(params)
|
def initialize(params)
|
||||||
@ -15,7 +17,7 @@ class Trends::PreviewCardProviderFilter
|
|||||||
scope = PreviewCardProvider.unscoped
|
scope = PreviewCardProvider.unscoped
|
||||||
|
|
||||||
params.each do |key, value|
|
params.each do |key, value|
|
||||||
next if key.to_s == 'page'
|
next if IGNORED_PARAMS.include?(key.to_s)
|
||||||
|
|
||||||
scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
|
scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user