balkan/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge commit '32f0e619f0' into kb_migration_development

Browse source
This commit is contained in:
KMY 2023-05-07 14:51:21 +09:00
commit 7c118ed1d0
446 changed files with 6295 additions and 3456 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/admin/appeal_filter.rb
View file

@ -5,6 +5,8 @@ class Admin::AppealFilter
status
).freeze
IGNORED_PARAMS = %w(page).freeze
attr_reader :params
def initialize(params)
@ -15,7 +17,7 @@ class Admin::AppealFilter
scope = Appeal.order(id: :desc)
params.each do |key, value|
next if %w(page).include?(key.to_s)
next if IGNORED_PARAMS.include?(key.to_s)
scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
end

4
app/models/admin/status_filter.rb
View file

@ -6,6 +6,8 @@ class Admin::StatusFilter
report_id
).freeze
IGNORED_PARAMS = %w(page report_id).freeze
attr_reader :params
def initialize(account, params)
@ -17,7 +19,7 @@ class Admin::StatusFilter
scope = @account.statuses.where(visibility: [:public, :unlisted, :public_unlisted])
params.each do |key, value|
next if %w(page report_id).include?(key.to_s)
next if IGNORED_PARAMS.include?(key.to_s)
scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
end