diff options
author | Starfall <us@starfall.systems> | 2022-11-28 16:41:29 -0600 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2022-11-28 16:41:29 -0600 |
commit | cb9dad90b01c9f53d1910cf128eb22200bdb9884 (patch) | |
tree | 1935d74f49853ed371e36cfac2d44ac33d2e8a2e /app/controllers/admin/export_domain_blocks_controller.rb | |
parent | c3c3b6953f37462f26f011b6c6cbd1655d5dcbea (diff) | |
parent | 1a7aa37b60769a10077c585fa76ec848b6866d9a (diff) |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/controllers/admin/export_domain_blocks_controller.rb')
-rw-r--r-- | app/controllers/admin/export_domain_blocks_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/export_domain_blocks_controller.rb b/app/controllers/admin/export_domain_blocks_controller.rb index 545bd94ed..fb0cd05d2 100644 --- a/app/controllers/admin/export_domain_blocks_controller.rb +++ b/app/controllers/admin/export_domain_blocks_controller.rb @@ -8,8 +8,6 @@ module Admin before_action :set_dummy_import!, only: [:new] - ROWS_PROCESSING_LIMIT = 20_000 - def new authorize :domain_block, :create? end @@ -23,12 +21,14 @@ module Admin authorize :domain_block, :create? @import = Admin::Import.new(import_params) + return render :new unless @import.validate + parse_import_data!(export_headers) @global_private_comment = I18n.t('admin.export_domain_blocks.import.private_comment_template', source: @import.data_file_name, date: I18n.l(Time.now.utc)) @form = Form::DomainBlockBatch.new - @domain_blocks = @data.take(ROWS_PROCESSING_LIMIT).filter_map do |row| + @domain_blocks = @data.take(Admin::Import::ROWS_PROCESSING_LIMIT).filter_map do |row| domain = row['#domain'].strip next if DomainBlock.rule_for(domain).present? |