From e52bcebb66a514521e8fa8835a029158b38774d6 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Fri, 25 Nov 2022 10:50:23 +0000 Subject: [PATCH] add placeholder for upload your file page --- app/controllers/bulk_upload_lettings_logs_controller.rb | 2 +- app/controllers/bulk_upload_sales_logs_controller.rb | 2 +- app/models/forms/bulk_upload_lettings/year.rb | 6 ------ app/models/forms/bulk_upload_sales/year.rb | 6 ------ 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb index 55c1421e2..5c2df1c55 100644 --- a/app/controllers/bulk_upload_lettings_logs_controller.rb +++ b/app/controllers/bulk_upload_lettings_logs_controller.rb @@ -27,7 +27,7 @@ class BulkUploadLettingsLogsController < ApplicationController def update if form.valid? - redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: form_params[:year] }) + redirect_to form.next_path else render form.view_path end diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb index eb2eef265..3c7cbd9bd 100644 --- a/app/controllers/bulk_upload_sales_logs_controller.rb +++ b/app/controllers/bulk_upload_sales_logs_controller.rb @@ -27,7 +27,7 @@ class BulkUploadSalesLogsController < ApplicationController def update if form.valid? - redirect_to bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: form_params[:year] }) + redirect_to form.next_path else render form.view_path end diff --git a/app/models/forms/bulk_upload_lettings/year.rb b/app/models/forms/bulk_upload_lettings/year.rb index 6cfd4b36b..9fa17b19e 100644 --- a/app/models/forms/bulk_upload_lettings/year.rb +++ b/app/models/forms/bulk_upload_lettings/year.rb @@ -27,12 +27,6 @@ module Forms bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: }) end - private - - def possible_years - FormHandler.instance.lettings_forms.values.map { |form| form.start_date.year }.sort.reverse - end - private def possible_years diff --git a/app/models/forms/bulk_upload_sales/year.rb b/app/models/forms/bulk_upload_sales/year.rb index 5b486f18a..361061990 100644 --- a/app/models/forms/bulk_upload_sales/year.rb +++ b/app/models/forms/bulk_upload_sales/year.rb @@ -27,12 +27,6 @@ module Forms bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: }) end - private - - def possible_years - FormHandler.instance.sales_forms.values.map { |form| form.start_date.year }.sort.reverse - end - private def possible_years