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

Refactor

pull/2839/head
Rachael Booth 1 year ago
parent
8a0158bcbc
commit
b47b63cb25
2 changed files with 8 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      app/controllers/bulk_upload_lettings_logs_controller.rb
  2. 9
      app/controllers/bulk_upload_sales_logs_controller.rb

9
app/controllers/bulk_upload_lettings_logs_controller.rb
Unescape View File

@ -1,7 +1,7 @@
class BulkUploadLettingsLogsController < ApplicationController class BulkUploadLettingsLogsController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
before_action :validate_data_protection_agrement_signed! before_action :validate_data_protection_agreement_signed!
before_action :validate_year! before_action :validate_year!, except: %w[start]
def start def start
if have_choice_of_year? if have_choice_of_year?
@ -25,16 +25,15 @@ class BulkUploadLettingsLogsController < ApplicationController
private private
def validate_data_protection_agrement_signed! def validate_data_protection_agreement_signed!
return if @current_user.organisation.data_protection_confirmed? return if @current_user.organisation.data_protection_confirmed?
redirect_to lettings_logs_path redirect_to lettings_logs_path
end end
def validate_year! def validate_year!
return if params[:action] == "start"
return if params[:id] == "year" return if params[:id] == "year"
return if params[:id] == "guidance" && (params[:form].nil? || params[:form][:year].nil?) return if params[:id] == "guidance" && params.dig(:form, :year).nil?
allowed_years = [current_year] allowed_years = [current_year]
allowed_years.push(current_year - 1) if FormHandler.instance.lettings_in_crossover_period? allowed_years.push(current_year - 1) if FormHandler.instance.lettings_in_crossover_period?

9
app/controllers/bulk_upload_sales_logs_controller.rb
Unescape View File

@ -1,7 +1,7 @@
class BulkUploadSalesLogsController < ApplicationController class BulkUploadSalesLogsController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
before_action :validate_data_protection_agrement_signed! before_action :validate_data_protection_agreement_signed!
before_action :validate_year! before_action :validate_year!, except: %w[start]
def start def start
if have_choice_of_year? if have_choice_of_year?
@ -25,16 +25,15 @@ class BulkUploadSalesLogsController < ApplicationController
private private
def validate_data_protection_agrement_signed! def validate_data_protection_agreement_signed!
return if @current_user.organisation.data_protection_confirmed? return if @current_user.organisation.data_protection_confirmed?
redirect_to sales_logs_path redirect_to sales_logs_path
end end
def validate_year! def validate_year!
return if params[:action] == "start"
return if params[:id] == "year" return if params[:id] == "year"
return if params[:id] == "guidance" && (params[:form].nil? || params[:form][:year].nil?) return if params[:id] == "guidance" && params.dig(:form, :year).nil?
allowed_years = [current_year] allowed_years = [current_year]
allowed_years.push(current_year - 1) if FormHandler.instance.sales_in_crossover_period? allowed_years.push(current_year - 1) if FormHandler.instance.sales_in_crossover_period?

Write Preview
Loading…
Cancel
Save