From 8026dc5bbecd55ce375e9c698486b63f53e3146a Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 10 Sep 2025 14:40:27 +0100 Subject: [PATCH] CLDC-4082: Allow for an unresolved log to redirect to the correct location page (#3102) previously would always go to location, causing issues for schemes with many locations --- app/models/form.rb | 6 +++++- app/models/form/lettings/pages/scheme.rb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/form.rb b/app/models/form.rb index 1a7f07a07..4e4d8d1ed 100644 --- a/app/models/form.rb +++ b/app/models/form.rb @@ -86,7 +86,11 @@ class Form end def next_page_id(page, log, current_user, ignore_answered: false) - return page.next_unresolved_page_id || :check_answers if log.unresolved + if log.unresolved + return log.scheme_has_large_number_of_locations? ? "location_search" : "location" if page.next_unresolved_page_id == :location_or_location_search + + return page.next_unresolved_page_id || :check_answers + end page_ids = page.subsection.pages.map(&:id) page_index = page_ids.index(page.id) diff --git a/app/models/form/lettings/pages/scheme.rb b/app/models/form/lettings/pages/scheme.rb index 9ac87a756..ae457a345 100644 --- a/app/models/form/lettings/pages/scheme.rb +++ b/app/models/form/lettings/pages/scheme.rb @@ -6,7 +6,7 @@ class Form::Lettings::Pages::Scheme < ::Form::Page "needstype" => 2, }, ] - @next_unresolved_page_id = "location" + @next_unresolved_page_id = :location_or_location_search end def questions