From 6cd941d05a9ca5dc0a772fa73565d886697395fa Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 10 Jul 2023 08:42:44 +0100 Subject: [PATCH] Add a path for duplicate logs --- app/controllers/form_controller.rb | 3 --- app/views/duplicate_logs/_banner.html.erb | 13 ------------- app/views/duplicate_logs/show.html.erb | 13 ++++++++++--- 3 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 app/views/duplicate_logs/_banner.html.erb diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb index a5ea5068b..c26553725 100644 --- a/app/controllers/form_controller.rb +++ b/app/controllers/form_controller.rb @@ -50,9 +50,6 @@ class FormController < ApplicationController @interruption_page_id = URI.parse(request.headers["HTTP_REFERER"]).path.split("/").last.underscore @interruption_page_referrer_type = referrer_from_query end - if @log.duplicate_logs? - redirect_to - end if @log page_id = request.path.split("/")[-1].underscore @page = form.get_page(page_id) diff --git a/app/views/duplicate_logs/_banner.html.erb b/app/views/duplicate_logs/_banner.html.erb deleted file mode 100644 index 14a89b770..000000000 --- a/app/views/duplicate_logs/_banner.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<% if question.page.routed_to?(@log, current_user) %> - <%= govuk_panel( - classes: "app-panel--interruption", - ) do %> -

<%= display_title_text(title_text, lettings_log) %>

- <% if informative_text.present? %> -

<%= display_informative_text(informative_text, lettings_log) %>

- <% end %> - <% if question.hint_text.present? %> -

<%= question.hint_text&.html_safe %>

- <% end %> - <% end %> -<% end %> diff --git a/app/views/duplicate_logs/show.html.erb b/app/views/duplicate_logs/show.html.erb index 79123af8d..2df116807 100644 --- a/app/views/duplicate_logs/show.html.erb +++ b/app/views/duplicate_logs/show.html.erb @@ -1,5 +1,12 @@ <% content_for :title, "Check duplicate logs" %> -back button -Duplicate logs blue box -List or components +
+
+ <%= govuk_panel( + classes: "app-panel--interruption", + ) do %> +

These logs are duplicates

+

These logs have the same values for the following fields. Choose one to keep or correct the answers.

+ <% end %> +
+
\ No newline at end of file