Browse Source

ensure link displayed successfully for all renderings of logs_list and params passed through relevant methods in organisations controller

pull/1268/head
Arthur Campbell 3 years ago
parent
commit
67d50efc9b
  1. 6
      app/controllers/organisations_controller.rb
  2. 12
      app/views/organisations/logs.html.erb

6
app/controllers/organisations_controller.rb

@ -107,12 +107,14 @@ class OrganisationsController < ApplicationController
def download_csv
organisation_logs = LettingsLog.all.where(owning_organisation_id: @organisation.id)
unpaginated_filtered_logs = filtered_logs(organisation_logs, search_term, @session_filters)
is_codes_only_export = params.require(:codes_only) == "true"
render "logs/download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: logs_email_csv_organisation_path }
render "logs/download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: logs_email_csv_organisation_path, is_codes_only_export: }
end
def email_csv
EmailCsvJob.perform_later(current_user, search_term, @session_filters, false, @organisation)
is_codes_only_export = params.require(:is_codes_only_export) == "true"
EmailCsvJob.perform_later(current_user, search_term, @session_filters, false, @organisation, is_codes_only_export)
redirect_to logs_csv_confirmation_organisation_path
end

12
app/views/organisations/logs.html.erb

@ -26,7 +26,17 @@
<div class="app-filter-layout__content">
<%= render SearchComponent.new(current_user:, search_label: "Search by log ID, tenant code, property reference or postcode", value: @searched) %>
<%= govuk_section_break(visible: true, size: "m") %>
<%= render partial: "logs/log_list", locals: { logs: @logs, title: "Logs", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count, csv_download_url: logs_csv_download_organisation_path(@organisation, search: @search_term) } %>
<%= render partial: "logs/log_list",
locals: {
logs: @logs,
title: "Logs",
pagy: @pagy,
searched: @searched,
item_label:,
total_count: @total_count,
csv_download_url: logs_csv_download_organisation_path(@organisation, search: @search_term, codes_only: false),
csv_codes_only_download_url: logs_csv_download_organisation_path(@organisation, search: @search_term, codes_only: true)
} %>
<%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
</div>
</div>

Loading…
Cancel
Save