Update cancel and back buttons

app/controllers/lettings_logs_controller.rb

@@ -92,7 +92,7 @@ class LettingsLogsController < LogsController
 
     unpaginated_filtered_logs = filter_manager.filtered_logs(current_user.lettings_logs, search_term, session_filters)
 
-    render "download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: email_csv_lettings_logs_path, codes_only: codes_only_export?, session_filters:, filter_type: "lettings_logs" }
+    render "download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: email_csv_lettings_logs_path, codes_only: codes_only_export?, session_filters:, filter_type: "lettings_logs", download_csv_back_link: lettings_logs_path }
   end
 
   def email_csv

app/controllers/organisations_controller.rb

@@ -154,7 +154,7 @@ class OrganisationsController < ApplicationController
     unpaginated_filtered_logs = filter_manager.filtered_logs(organisation_logs, search_term, session_filters)
     codes_only = params.require(:codes_only) == "true"
 
-    render "logs/download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: lettings_logs_email_csv_organisation_path, codes_only:, session_filters:, filter_type: "lettings_logs" }
+    render "logs/download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: lettings_logs_email_csv_organisation_path, codes_only:, session_filters:, filter_type: "lettings_logs", download_csv_back_link: lettings_logs_organisation_path(@organisation) }
   end
 
   def email_lettings_csv
@@ -192,7 +192,7 @@ class OrganisationsController < ApplicationController
     unpaginated_filtered_logs = filter_manager.filtered_logs(organisation_logs, search_term, session_filters)
     codes_only = params.require(:codes_only) == "true"
 
-    render "logs/download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: sales_logs_email_csv_organisation_path, codes_only:, session_filters:, filter_type: "sales_logs" }
+    render "logs/download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: sales_logs_email_csv_organisation_path, codes_only:, session_filters:, filter_type: "sales_logs", download_csv_back_link: sales_logs_organisation_path(@organisation) }
   end
 
   def email_sales_csv

app/controllers/sales_logs_controller.rb

@@ -66,7 +66,7 @@ class SalesLogsController < LogsController
 
     unpaginated_filtered_logs = filter_manager.filtered_logs(current_user.sales_logs, search_term, session_filters)
 
-    render "download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: email_csv_sales_logs_path, codes_only: codes_only_export?, session_filters:, filter_type: "sales_logs" }
+    render "download_csv", locals: { search_term:, count: unpaginated_filtered_logs.size, post_path: email_csv_sales_logs_path, codes_only: codes_only_export?, session_filters:, filter_type: "sales_logs", download_csv_back_link: sales_logs_path }
   end
 
   def email_csv

app/helpers/filters_helper.rb

@@ -184,6 +184,14 @@ module FiltersHelper
     end
   end
 
+  def cancel_csv_filters_update_url(filter_type, search, codes_only, organisation_id)
+    if organisation_id.present?
+      send("#{filter_type}_csv_download_organisation_path", id: organisation_id, search:, codes_only:)
+    else
+      send("csv_download_#{filter_type}_path", search:, codes_only:)
+    end
+  end
+
   def change_filter_for_csv_url(filter, filter_type, search_term, codes_only, organisation_id)
     if organisation_id.present?
       send("#{filter_type}_filters_#{filter[:id]}_organisation_path", organisation_id, search: search_term, codes_only:, referrer: "check_answers")

app/views/filters/assigned_to.html.erb

@@ -26,6 +26,6 @@
 
   <div class="govuk-button-group">
     <%= f.govuk_submit "Save changes" %>
-    <%= govuk_button_link_to "Cancel", send("csv_download_#{@filter_type}_path", search: request.params["search"], codes_only: request.params["codes_only"]), secondary: true %>
+    <%= govuk_button_link_to "Cancel", cancel_csv_filters_update_url(@filter_type, request.params["search"], request.params["codes_only"], @organisation_id), secondary: true %>
   </div>
 <% end %>

app/views/filters/managed_by.html.erb

@@ -25,6 +25,6 @@
 
   <div class="govuk-button-group">
     <%= f.govuk_submit "Save changes" %>
-    <%= govuk_button_link_to "Cancel", send("csv_download_#{@filter_type}_path", search: request.params["search"], codes_only: request.params["codes_only"]), secondary: true %>
+    <%= govuk_button_link_to "Cancel", cancel_csv_filters_update_url(@filter_type, request.params["search"], request.params["codes_only"], @organisation_id), secondary: true %>
   </div>
 <% end %>

app/views/filters/needstype.html.erb

@@ -15,6 +15,6 @@
 
   <div class="govuk-button-group">
     <%= f.govuk_submit "Save changes" %>
-    <%= govuk_button_link_to "Cancel", send("csv_download_#{@filter_type}_path", search: request.params["search"], codes_only: request.params["codes_only"]), secondary: true %>
+    <%= govuk_button_link_to "Cancel", cancel_csv_filters_update_url(@filter_type, request.params["search"], request.params["codes_only"], @organisation_id), secondary: true %>
   </div>
 <% end %>

app/views/filters/owned_by.html.erb

@@ -25,6 +25,6 @@
 
   <div class="govuk-button-group">
     <%= f.govuk_submit "Save changes" %>
-    <%= govuk_button_link_to "Cancel", send("csv_download_#{@filter_type}_path", search: request.params["search"], codes_only: request.params["codes_only"]), secondary: true %>
+    <%= govuk_button_link_to "Cancel", cancel_csv_filters_update_url(@filter_type, request.params["search"], request.params["codes_only"], @organisation_id), secondary: true %>
   </div>
 <% end %>

app/views/filters/status.html.erb

@@ -15,6 +15,6 @@
 
   <div class="govuk-button-group">
     <%= f.govuk_submit "Save changes" %>
-    <%= govuk_button_link_to "Cancel", send("csv_download_#{@filter_type}_path", search: request.params["search"], codes_only: request.params["codes_only"]), secondary: true %>
+    <%= govuk_button_link_to "Cancel", cancel_csv_filters_update_url(@filter_type, request.params["search"], request.params["codes_only"], @organisation_id), secondary: true %>
   </div>
 <% end %>

app/views/filters/years.html.erb

@@ -32,6 +32,6 @@
 
   <div class="govuk-button-group">
     <%= f.govuk_submit "Save changes" %>
-    <%= govuk_button_link_to "Cancel", params["referrer"] == "check_answers" ? send("csv_download_#{@filter_type}_path", search: request.params["search"], codes_only: request.params["codes_only"]) : send("#{@filter_type}_path"), secondary: true %>
+    <%= govuk_button_link_to "Cancel", params["referrer"] == "check_answers" ? cancel_csv_filters_update_url(@filter_type, request.params["search"], request.params["codes_only"], @organisation_id) : send("#{@filter_type}_path"), secondary: true %>
   </div>
 <% end %>

app/views/logs/download_csv.html.erb

@@ -1,7 +1,7 @@
 <% content_for :title, "Download CSV" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(href: :back) %>
+  <%= govuk_back_link(href: download_csv_back_link) %>
 <% end %>
 
 <div class="govuk-grid-row">