From 0fe11ab5de45deaa1e874003a8573c590d050fff Mon Sep 17 00:00:00 2001
From: Kat <54268893+kosiakkatrina@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:44:38 +0000
Subject: [PATCH] Update restore_error_field_values

---
 app/controllers/form_controller.rb    | 2 +-
 app/helpers/form_page_error_helper.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index b1942d4fe..3e029371d 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -106,7 +106,7 @@ private
     return unless previous_responses
 
     previous_responses_to_reset = previous_responses.reject do |key, value|
-      if @log.form.get_question(key, @log)&.type == "date" && @log[key]
+      if @log.form.get_question(key, @log)&.type == "date" && value.present?
         year = value.split("-").first.to_i
         year&.zero?
       else
diff --git a/app/helpers/form_page_error_helper.rb b/app/helpers/form_page_error_helper.rb
index 27dbf2b28..bf4e1db08 100644
--- a/app/helpers/form_page_error_helper.rb
+++ b/app/helpers/form_page_error_helper.rb
@@ -15,6 +15,6 @@ module FormPageErrorHelper
 
   def all_pages_affected_by_errors(log)
     question_ids = (log.errors.map(&:attribute) - [:base]).uniq
-    question_ids.map { |id| log.form.get_question(id, log).page.id }.uniq
+    question_ids.map { |id| log.form.get_question(id, log)&.page&.id }.compact.uniq
   end
 end