From 5d710b1139b34f2ed6bd556f448fa7248354e758 Mon Sep 17 00:00:00 2001 From: Eugen Date: Sun, 16 Apr 2017 12:51:30 +0200 Subject: Make file attachment on MediaAttachment optional (#1865) Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI --- app/controllers/admin/domain_blocks_controller.rb | 14 ++++++++++++-- app/controllers/application_controller.rb | 4 +++- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb index a8b56c085..5d146d946 100644 --- a/app/controllers/admin/domain_blocks_controller.rb +++ b/app/controllers/admin/domain_blocks_controller.rb @@ -15,16 +15,26 @@ module Admin if @domain_block.save DomainBlockWorker.perform_async(@domain_block.id) - redirect_to admin_domain_blocks_path, notice: 'Domain block is now being processed' + redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_block.created_msg') else render action: :new end end + def show + @domain_block = DomainBlock.find(params[:id]) + end + + def destroy + @domain_block = DomainBlock.find(params[:id]) + UnblockDomainService.new.call(@domain_block, resource_params[:retroactive]) + redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_block.destroyed_msg') + end + private def resource_params - params.require(:domain_block).permit(:domain, :severity) + params.require(:domain_block).permit(:domain, :severity, :reject_media, :retroactive) end end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0c320177d..e8d7de218 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,7 +8,9 @@ class ApplicationController < ActionController::Base force_ssl if: "Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'" include Localized - helper_method :current_account, :single_user_mode? + + helper_method :current_account + helper_method :single_user_mode? rescue_from ActionController::RoutingError, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found -- cgit