Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Make file attachment on MediaAttachment optional (#1865)

Browse source 
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
This commit is contained in:
Eugen 2017-04-16 12:51:30 +02:00 • committed by GitHub
parent 8a58942c80
commit 5d710b1139
14 changed files with 106 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/admin/domain_blocks_controller.rb
View file

@ -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