From 1c5eb09290bd9643610b2d70048bc64e76042117 Mon Sep 17 00:00:00 2001 From: Sam Seed Date: Wed, 4 Jan 2023 13:08:51 +0000 Subject: [PATCH] refactor: ensure label_from_value always accepts log & nil as args --- app/models/form/common/questions/created_by_id.rb | 2 +- app/models/form/common/questions/owning_organisation_id.rb | 2 +- app/models/form/lettings/questions/created_by_id.rb | 2 +- app/models/form/question.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/form/common/questions/created_by_id.rb b/app/models/form/common/questions/created_by_id.rb index 5b6631868..3c3447951 100644 --- a/app/models/form/common/questions/created_by_id.rb +++ b/app/models/form/common/questions/created_by_id.rb @@ -24,7 +24,7 @@ class Form::Common::Questions::CreatedById < ::Form::Question answer_options.select { |k, _v| user_ids.include?(k) } end - def label_from_value(value) + def label_from_value(value, log = nil, user = nil) return unless value answer_options[value] diff --git a/app/models/form/common/questions/owning_organisation_id.rb b/app/models/form/common/questions/owning_organisation_id.rb index c09968ef9..13a7a33d1 100644 --- a/app/models/form/common/questions/owning_organisation_id.rb +++ b/app/models/form/common/questions/owning_organisation_id.rb @@ -21,7 +21,7 @@ class Form::Common::Questions::OwningOrganisationId < ::Form::Question answer_options end - def label_from_value(value) + def label_from_value(value, log = nil, user = nil) return unless value answer_options[value] diff --git a/app/models/form/lettings/questions/created_by_id.rb b/app/models/form/lettings/questions/created_by_id.rb index d61be8882..dbebce958 100644 --- a/app/models/form/lettings/questions/created_by_id.rb +++ b/app/models/form/lettings/questions/created_by_id.rb @@ -27,7 +27,7 @@ class Form::Lettings::Questions::CreatedById < ::Form::Question answer_options.select { |k, _v| user_ids.include?(k) } end - def label_from_value(value) + def label_from_value(value, log = nil, user = nil) return unless value answer_options[value] diff --git a/app/models/form/question.rb b/app/models/form/question.rb index 979e8d19d..b5090fd84 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -151,7 +151,7 @@ class Form::Question end end - def label_from_value(value, user = nil) + def label_from_value(value, log = nil, user = nil) return unless value label = case type