Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)
* Allow import/export of instance-level domain blocks/allows (#1754) * Allow import/export of instance-level domain blocks/allows. Fixes #15095 * Pacify circleci * Address simple code review feedback * Add headers to exported CSV * Extract common import/export functionality to AdminExportControllerConcern * Add additional fields to instance-blocked domain export * Address review feedback * Split instance domain block/allow import/export into separate pages/controllers * Address code review feedback * Pacify DeepSource * Work around Paperclip::HasAttachmentFile for Rails 6 * Fix deprecated API warning in export tests * Remove after_commit workaround (cherry picked from commit 94e98864e39c010635e839fea984f2b4893bef1a) * Add confirmation page when importing blocked domains (#1773) * Move glitch-soc-specific strings to glitch-soc-specific locale files * Add confirmation page when importing blocked domains (cherry picked from commit b91196f4b73fff91997b8077619ae25b6d04a59e) * Fix authorization check in domain blocks controller (cherry picked from commit 75279377583c6e2aa04cc8d7380c593979630b38) * Fix error strings for domain blocks and email-domain blocks Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's" * Ran i18n-tasks normalize to address test failure * Removed unused admin.export_domain_blocks.not_permitted string Removing unused string as indicated by Check i18n * Fix tests (cherry picked from commit 9094c2f52c24e1c00b594e7c11cd00e4a07eb431) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960) * Fix various issues with domain block import - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded (cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902) Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
		
					parent
					
						
							
								e7deea62d1
							
						
					
				
			
			
				commit
				
					
						c373148b3d
					
				
			
		
					 23 changed files with 537 additions and 2 deletions
				
			
		|  | @ -225,7 +225,25 @@ Rails.application.routes.draw do | |||
|     get '/dashboard', to: 'dashboard#index' | ||||
| 
 | ||||
|     resources :domain_allows, only: [:new, :create, :show, :destroy] | ||||
|     resources :domain_blocks, only: [:new, :create, :destroy, :update, :edit] | ||||
|     resources :domain_blocks, only: [:new, :create, :show, :destroy, :update, :edit] do | ||||
|       collection do | ||||
|         post :batch | ||||
|       end | ||||
|     end | ||||
| 
 | ||||
|     resources :export_domain_allows, only: [:new] do | ||||
|       collection do | ||||
|         get :export, constraints: { format: :csv } | ||||
|         post :import | ||||
|       end | ||||
|     end | ||||
| 
 | ||||
|     resources :export_domain_blocks, only: [:new] do | ||||
|       collection do | ||||
|         get :export, constraints: { format: :csv } | ||||
|         post :import | ||||
|       end | ||||
|     end | ||||
| 
 | ||||
|     resources :email_domain_blocks, only: [:index, :new, :create] do | ||||
|       collection do | ||||
|  | @ -523,6 +541,7 @@ Rails.application.routes.draw do | |||
|       end | ||||
| 
 | ||||
|       resource :domain_blocks, only: [:show, :create, :destroy] | ||||
| 
 | ||||
|       resource :directory, only: [:show] | ||||
| 
 | ||||
|       resources :follow_requests, only: [:index] do | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue