From 19a21b37afe5dfb69379259755d5caeda6ef4901 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 9 Mar 2022 14:50:35 +0000 Subject: [PATCH] refactor next_page --- app/models/form.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/models/form.rb b/app/models/form.rb index 406e19b79..e8e553fac 100644 --- a/app/models/form.rb +++ b/app/models/form.rb @@ -35,15 +35,9 @@ class Form def next_page(page, case_log) page_ids = subsection_for_page(page).pages.map(&:id) page_index = page_ids.index(page.id) - nxt_page = if page.id.include?("value_check") - if case_log[page.id] == 1 - get_page(page_ids[page_index - 1]) - else - get_page(page_ids[page_index + 1]) - end - else - get_page(page_ids[page_index + 1]) - end + page_id = page.id.include?("value_check") && case_log[page.id] == 1 ? page_ids[page_index - 1] : page_ids[page_index + 1] + nxt_page = get_page(page_id) + return :check_answers if nxt_page.nil? return nxt_page.id if nxt_page.routed_to?(case_log)