diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-05-30 13:06:01 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-30 19:06:01 +0200 |
| commit | 0ebe7d6d236d47bf805a920dc722897bafec7459 (patch) | |
| tree | e3f08f8d34ef2ea58978e528f53518f864c04c71 /app/controllers/settings/exports | |
| parent | 23081bb2994b34108fb06e15d3101849a3077cf9 (diff) | |
Remove exports/base controller in favor of shared concern (#3444)
Diffstat (limited to 'app/controllers/settings/exports')
4 files changed, 21 insertions, 26 deletions
diff --git a/app/controllers/settings/exports/base_controller.rb b/app/controllers/settings/exports/base_controller.rb deleted file mode 100644 index c082ed806..000000000 --- a/app/controllers/settings/exports/base_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -module Settings - module Exports - class BaseController < ApplicationController - before_action :authenticate_user! - - def index - @export = Export.new(current_account) - - respond_to do |format| - format.csv { send_data export_data, filename: export_filename } - end - end - - private - - def export_filename - "#{controller_name}.csv" - end - end - end -end diff --git a/app/controllers/settings/exports/blocked_accounts_controller.rb b/app/controllers/settings/exports/blocked_accounts_controller.rb index f1115b21e..2092104e0 100644 --- a/app/controllers/settings/exports/blocked_accounts_controller.rb +++ b/app/controllers/settings/exports/blocked_accounts_controller.rb @@ -2,7 +2,13 @@ module Settings module Exports - class BlockedAccountsController < BaseController + class BlockedAccountsController < ApplicationController + include ExportControllerConcern + + def index + send_export_file + end + private def export_data diff --git a/app/controllers/settings/exports/following_accounts_controller.rb b/app/controllers/settings/exports/following_accounts_controller.rb index 0011d2463..74281ddca 100644 --- a/app/controllers/settings/exports/following_accounts_controller.rb +++ b/app/controllers/settings/exports/following_accounts_controller.rb @@ -2,7 +2,13 @@ module Settings module Exports - class FollowingAccountsController < BaseController + class FollowingAccountsController < ApplicationController + include ExportControllerConcern + + def index + send_export_file + end + private def export_data diff --git a/app/controllers/settings/exports/muted_accounts_controller.rb b/app/controllers/settings/exports/muted_accounts_controller.rb index dfe72cfcb..e511619ca 100644 --- a/app/controllers/settings/exports/muted_accounts_controller.rb +++ b/app/controllers/settings/exports/muted_accounts_controller.rb @@ -2,7 +2,13 @@ module Settings module Exports - class MutedAccountsController < BaseController + class MutedAccountsController < ApplicationController + include ExportControllerConcern + + def index + send_export_file + end + private def export_data |