Browse Source

use that fact that params is always available in controllers and don't pass it around, inline some methods calls

pull/1568/head
Arthur Campbell 3 years ago
parent
commit
5e53d23f0f
  1. 9
      app/controllers/lettings_logs_controller.rb
  2. 2
      app/controllers/logs_controller.rb
  3. 9
      app/controllers/sales_logs_controller.rb

9
app/controllers/lettings_logs_controller.rb

@ -81,15 +81,13 @@ class LettingsLogsController < LogsController
def download_csv
unpaginated_filtered_logs = filtered_logs(current_user.lettings_logs, search_term, @session_filters)
codes_only = codes_only_export?(params)
render "download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: email_csv_lettings_logs_path, codes_only: }
render "download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: email_csv_lettings_logs_path, codes_only: codes_only_export? }
end
def email_csv
all_orgs = params["organisation_select"] == "all"
codes_only_export = codes_only_export?(params)
EmailCsvJob.perform_later(current_user, search_term, @session_filters, all_orgs, nil, codes_only_export)
EmailCsvJob.perform_later(current_user, search_term, @session_filters, all_orgs, nil, codes_only_export?)
redirect_to csv_confirmation_lettings_logs_path
end
@ -116,8 +114,7 @@ class LettingsLogsController < LogsController
private
def authenticate_scope!
codes_only_export = codes_only_export?(params)
head :unauthorized and return if codes_only_export && !current_user.support?
head :unauthorized and return if codes_only_export? && !current_user.support?
end
def redirect_if_bulk_upload_resolved

2
app/controllers/logs_controller.rb

@ -28,7 +28,7 @@ private
end
end
def codes_only_export?(params)
def codes_only_export?
params.require(:codes_only) == "true"
end

9
app/controllers/sales_logs_controller.rb

@ -39,15 +39,13 @@ class SalesLogsController < LogsController
def download_csv
unpaginated_filtered_logs = filtered_logs(current_user.sales_logs, search_term, @session_filters)
codes_only = codes_only_export?(params)
render "download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: email_csv_sales_logs_path, codes_only: }
render "download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: email_csv_sales_logs_path, codes_only: codes_only_export? }
end
def email_csv
all_orgs = params["organisation_select"] == "all" # what's this for? params['organisation_select'] appears to always be nil
codes_only_export = codes_only_export?(params)
EmailCsvJob.perform_later(current_user, search_term, @session_filters, all_orgs, nil, codes_only_export, "sales")
EmailCsvJob.perform_later(current_user, search_term, @session_filters, all_orgs, nil, codes_only_export?, "sales")
redirect_to csv_confirmation_sales_logs_path
end
@ -64,7 +62,6 @@ class SalesLogsController < LogsController
private
def authenticate_scope!
codes_only_export = codes_only_export?(params)
head :unauthorized and return if codes_only_export && !current_user.support?
head :unauthorized and return if codes_only_export? && !current_user.support?
end
end

Loading…
Cancel
Save