From c8d8a901395b431e6919e0cb93707db845394f8b Mon Sep 17 00:00:00 2001 From: Laurence de Bruxelles Date: Mon, 24 Feb 2025 10:52:25 +0200 Subject: [PATCH] Rename route_owner to route_page --- app/controllers/pages_controller.rb | 16 ++++++++-------- app/views/pages/delete.html.erb | 4 ++-- config/locales/en.yml | 10 +++++----- spec/views/pages/delete.html.erb_spec.rb | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 184af2365..c400d5e38 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -22,23 +22,23 @@ def delete if @page.routing_conditions.any? && @page.routing_conditions.first.secondary_skip? @routing = :start_of_secondary_skip_route - # route owner is condition check page - @route_owner = PageRepository.find(page_id: @page.routing_conditions.first.check_page_id, form_id: current_form.id) + # route page is condition check page + @route_page = PageRepository.find(page_id: @page.routing_conditions.first.check_page_id, form_id: current_form.id) elsif @page.routing_conditions.any? @routing = :start_of_route - # route owner is us - @route_owner = @page + # route page is us + @route_page = @page elsif @page_goto_conditions.any? && @page_goto_conditions.first.secondary_skip? @routing = :end_of_secondary_skip_route - # route owner is condition check page - @route_owner = PageRepository.find(page_id: @page_goto_conditions.first.check_page_id, form_id: current_form.id) + # route page is condition check page + @route_page = PageRepository.find(page_id: @page_goto_conditions.first.check_page_id, form_id: current_form.id) elsif @page_goto_conditions.any? @routing = :end_of_route - # route owner is condition routing page - @route_owner = PageRepository.find(page_id: @page_goto_conditions.first.routing_page_id, form_id: current_form.id) + # route page is condition routing page + @route_page = PageRepository.find(page_id: @page_goto_conditions.first.routing_page_id, form_id: current_form.id) end @delete_confirmation_input = Forms::DeleteConfirmationInput.new diff --git a/app/views/pages/delete.html.erb b/app/views/pages/delete.html.erb index 8de33d382..8a20a59ff 100644 --- a/app/views/pages/delete.html.erb +++ b/app/views/pages/delete.html.erb @@ -11,8 +11,8 @@ t( ".notification_banner.#{@routing}.html", - route_owner_position: @route_owner.position, - show_routes_href: show_routes_path(current_form.id, @route_owner.id), + route_page_position: @route_page.position, + show_routes_href: show_routes_path(current_form.id, @route_page.id), ) end %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 3fe9be784..a6f8f72ba 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1155,14 +1155,14 @@ en: heading_text: Question %{page_position} is at the end of a route html: |

- Question %{route_owner_position}’s route - goes to this question. If you delete this question, question %{route_owner_position}’s routes will also be deleted. + Question %{route_page_position}’s route + goes to this question. If you delete this question, question %{route_page_position}’s routes will also be deleted.

end_of_secondary_skip_route: heading_text: Question %{page_position} is at the end of a route html: |

- Question %{route_owner_position}’s route + Question %{route_page_position}’s route goes to this question. If you delete this question, the route to it will also be deleted.

start_of_route: @@ -1170,13 +1170,13 @@ en: html: |

If you delete this question, its routes will also be deleted. - View question %{route_owner_position}’s routes. + View question %{route_page_position}’s routes.

start_of_secondary_skip_route: heading_text: Question %{page_position} is the start of a route html: |

- Question %{route_owner_position}’s route + Question %{route_page_position}’s route starts at this question. If you delete this question, the route from it will also be deleted.

title: Are you sure you want to delete this question? diff --git a/spec/views/pages/delete.html.erb_spec.rb b/spec/views/pages/delete.html.erb_spec.rb index 30bbc9eff..0fc6b52b0 100644 --- a/spec/views/pages/delete.html.erb_spec.rb +++ b/spec/views/pages/delete.html.erb_spec.rb @@ -67,7 +67,7 @@ before do assign(:routing, :start_of_route) - assign(:route_owner, page) + assign(:route_page, page) render locals: { current_form: } end @@ -122,7 +122,7 @@ before do assign(:routing, :end_of_route) - assign(:route_owner, routing_page) + assign(:route_page, routing_page) assign(:page_goto_conditions, routing_page.routing_conditions) @@ -182,7 +182,7 @@ before do assign(:routing, :start_of_secondary_skip_route) - assign(:route_owner, check_page) + assign(:route_page, check_page) render locals: { current_form: } end @@ -250,7 +250,7 @@ before do assign(:page_goto_conditions, routing_page.routing_conditions) assign(:routing, :end_of_secondary_skip_route) - assign(:route_owner, check_page) + assign(:route_page, check_page) render locals: { current_form: } end