baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

.compact form

pull/2629/head
Manny Dinssa 2 years ago
parent
2e5d113bef
commit
cf433046ce
10 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/controllers/bulk_upload_lettings_logs_controller.rb
  2. 2
      app/models/forms/bulk_upload_lettings/guidance.rb
  3. 4
      app/models/forms/bulk_upload_lettings/needstype.rb
  4. 4
      app/models/forms/bulk_upload_lettings/prepare_your_file.rb
  5. 4
      app/models/forms/bulk_upload_lettings/upload_your_file.rb
  6. 2
      app/models/forms/bulk_upload_lettings/year.rb
  7. 2
      app/models/forms/bulk_upload_sales/guidance.rb
  8. 4
      app/models/forms/bulk_upload_sales/prepare_your_file.rb
  9. 4
      app/models/forms/bulk_upload_sales/upload_your_file.rb
  10. 2
      app/models/forms/bulk_upload_sales/year.rb

4
app/controllers/bulk_upload_lettings_logs_controller.rb
Unescape View File

@ -4,9 +4,9 @@ class BulkUploadLettingsLogsController < ApplicationController
def start
if have_choice_of_year?
redirect_to bulk_upload_lettings_log_path(id: "year", form: { organisation_id: })
redirect_to bulk_upload_lettings_log_path(id: "year", form: { organisation_id: }.compact)
else
redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: current_year, organisation_id: })
redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: current_year, organisation_id: }.compact)
end
end

2
app/models/forms/bulk_upload_lettings/guidance.rb
Unescape View File

@ -16,7 +16,7 @@ module Forms
def back_path
case referrer
when "prepare-your-file"
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year:, organisation_id: })
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year:, organisation_id: }.compact)
when "home"
root_path
else

4
app/models/forms/bulk_upload_lettings/needstype.rb
Unescape View File

@ -20,11 +20,11 @@ module Forms
end
def back_path
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year:, needstype:, organisation_id: })
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year:, needstype:, organisation_id: }.compact)
end
def next_path
bulk_upload_lettings_log_path(id: "upload-your-file", form: { year:, needstype:, organisation_id: })
bulk_upload_lettings_log_path(id: "upload-your-file", form: { year:, needstype:, organisation_id: }.compact)
end
def year_combo

4
app/models/forms/bulk_upload_lettings/prepare_your_file.rb
Unescape View File

@ -20,7 +20,7 @@ module Forms
def back_path
if have_choice_of_year?
Rails.application.routes.url_helpers.bulk_upload_lettings_log_path(id: "year", form: { year:, organisation_id: })
Rails.application.routes.url_helpers.bulk_upload_lettings_log_path(id: "year", form: { year:, organisation_id: }.compact)
elsif organisation_id.present?
lettings_logs_organisation_path(organisation_id)
else
@ -29,7 +29,7 @@ module Forms
end
def next_path
bulk_upload_lettings_log_path(id: "upload-your-file", form: { year:, needstype:, organisation_id: })
bulk_upload_lettings_log_path(id: "upload-your-file", form: { year:, needstype:, organisation_id: }.compact)
end
def legacy_template_path

4
app/models/forms/bulk_upload_lettings/upload_your_file.rb
Unescape View File

@ -21,7 +21,7 @@ module Forms
end
def back_path
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year:, needstype:, organisation_id: })
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year:, needstype:, organisation_id: }.compact)
end
def year_combo
@ -29,7 +29,7 @@ module Forms
end
def next_path
bulk_upload_lettings_log_path(id: "checking-file", form: { year:, organisation_id: })
bulk_upload_lettings_log_path(id: "checking-file", form: { year:, organisation_id: }.compact)
end
def save!

2
app/models/forms/bulk_upload_lettings/year.rb
Unescape View File

@ -29,7 +29,7 @@ module Forms
end
def next_path
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year:, organisation_id: })
bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year:, organisation_id: }.compact)
end
def save!

2
app/models/forms/bulk_upload_sales/guidance.rb
Unescape View File

@ -16,7 +16,7 @@ module Forms
def back_path
case referrer
when "prepare-your-file"
bulk_upload_sales_log_path(id: "prepare-your-file", form: { year:, organisation_id: })
bulk_upload_sales_log_path(id: "prepare-your-file", form: { year:, organisation_id: }.compact)
when "home"
root_path
else

4
app/models/forms/bulk_upload_sales/prepare_your_file.rb
Unescape View File

@ -19,7 +19,7 @@ module Forms
def back_path
if have_choice_of_year?
Rails.application.routes.url_helpers.bulk_upload_sales_log_path(id: "year", form: { year: })
Rails.application.routes.url_helpers.bulk_upload_sales_log_path(id: "year", form: { year: }.compact)
elsif organisation_id.present?
sales_logs_organisation_path(organisation_id)
else
@ -28,7 +28,7 @@ module Forms
end
def next_path
bulk_upload_sales_log_path(id: "upload-your-file", form: { year:, organisation_id: })
bulk_upload_sales_log_path(id: "upload-your-file", form: { year:, organisation_id: }.compact)
end
def legacy_template_path

4
app/models/forms/bulk_upload_sales/upload_your_file.rb
Unescape View File

@ -20,7 +20,7 @@ module Forms
end
def back_path
bulk_upload_sales_log_path(id: "prepare-your-file", form: { year:, organisation_id: })
bulk_upload_sales_log_path(id: "prepare-your-file", form: { year:, organisation_id: }.compact)
end
def year_combo
@ -28,7 +28,7 @@ module Forms
end
def next_path
bulk_upload_sales_log_path(id: "checking-file", form: { year: })
bulk_upload_sales_log_path(id: "checking-file", form: { year:, organisation_id:}.compact)
end
def save!

2
app/models/forms/bulk_upload_sales/year.rb
Unescape View File

@ -29,7 +29,7 @@ module Forms
end
def next_path
bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: })
bulk_upload_sales_log_path(id: "prepare-your-file", form: { year:, organisation_id: }.compact)
end
def save!

Write Preview
Loading…
Cancel
Save