From 2ea59e5048986b94b8144c759eca08301539797e Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 21 Dec 2021 12:48:23 +0000
Subject: [PATCH] Re-lookup page to ensure we have the definition for the right
 form

---
 app/controllers/form_controller.rb      | 3 ++-
 spec/fixtures/forms/test_validator.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index 10dddac3b..5c1c23c5b 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -34,7 +34,8 @@ class FormController < ApplicationController
       define_method(page.id) do |_errors = {}|
         if @case_log
           subsection = @case_log.form.subsection_for_page(page)
-          render "form/page", locals: { page: page, subsection: subsection.label }
+          case_log_form_page = @case_log.form.get_page(page.id)
+          render "form/page", locals: { page: case_log_form_page, subsection: subsection.label }
         else
           render_not_found
         end
diff --git a/spec/fixtures/forms/test_validator.json b/spec/fixtures/forms/test_validator.json
index 2436a3c61..6771b995c 100644
--- a/spec/fixtures/forms/test_validator.json
+++ b/spec/fixtures/forms/test_validator.json
@@ -28,7 +28,7 @@
               "header": "",
               "description": "",
               "questions": {
-                "age1": {
+                "person_1_age": {
                   "check_answer_label": "Tenant's age",
                   "header": "What is the tenant's age?",
                   "hint_text": "",