Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-08-26 15:25:26 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix email blocks domain filter not being kept through pagination (#40254)

Browse Source
This commit is contained in:
Claire
2026-08-24 08:16:14 +00:00
committed by GitHub
parent c3eadc8d25
commit 3fb0d036a2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/email_domain_blocks_controller.rb
View File

@@ -59,7 +59,7 @@ module Admin
def filter_by_domain
scope = EmailDomainBlock.parents.includes(:children).order(id: :desc)
scope.merge!(EmailDomainBlock.matches_domain(params[:domain])) if params[:domain].present?
scope.merge!(EmailDomainBlock.matches_domain(params[:by_domain])) if params[:by_domain].present?
scope
end

6
app/views/admin/email_domain_blocks/index.html.haml
View File

@@ -7,8 +7,8 @@
= form_with url: admin_email_domain_blocks_path, method: :get, class: :simple_form do |f|
.fields-group
.input.string.optional
= f.text_field :domain,
value: params[:domain],
= f.text_field :by_domain,
value: params[:by_domain],
class: 'string optional',
placeholder: t('admin.email_domain_blocks.domain')
@@ -20,7 +20,7 @@
= form_with model: @form, url: batch_admin_email_domain_blocks_path do |f|
= hidden_field_tag :page, params[:page] || 1
= hidden_field_tag :domain, params[:domain] if params[:domain].present?
= hidden_field_tag :by_domain, params[:by_domain] if params[:by_domain].present?
.batch-table
.batch-table__toolbar

6
spec/system/admin/email_domain_blocks_spec.rb
View File

@@ -98,7 +98,7 @@ RSpec.describe 'Admin::EmailDomainBlocks' do
end
it 'filters by domain' do
fill_in 'domain', with: 'example.com'
fill_in 'by_domain', with: 'example.com'
click_on I18n.t('admin.email_domain_blocks.search')
expect(page).to have_text('example.com')
@@ -106,7 +106,7 @@ RSpec.describe 'Admin::EmailDomainBlocks' do
end
it 'shows empty page when no such domains are blocked' do
fill_in 'domain', with: 'mydomain.com'
fill_in 'by_domain', with: 'mydomain.com'
click_on I18n.t('admin.email_domain_blocks.search')
expect(page).to have_no_text('mydomain.com')
@@ -114,7 +114,7 @@ RSpec.describe 'Admin::EmailDomainBlocks' do
end
it 'returns to the list when resetting the search' do
fill_in 'domain', with: 'example.com'
fill_in 'by_domain', with: 'example.com'
click_on I18n.t('admin.email_domain_blocks.search')
click_on I18n.t('admin.email_domain_blocks.reset')