diff --git a/app/views/logs/update_logs.html.erb b/app/views/logs/update_logs.html.erb
index 22b8b1823..758d78253 100644
--- a/app/views/logs/update_logs.html.erb
+++ b/app/views/logs/update_logs.html.erb
@@ -1,36 +1,46 @@
<% item_label = format_label(@pagy.count, "logs") %>
-<% title = format_title(@searched, "Logs", current_user, item_label, @pagy.count, nil) %>
+<% title = "Update logs"%>
<% content_for :title, title %>
-<%= render partial: "organisations/headings", locals: { main: "You need to update #{@total_count} logs", sub: "" } %>
+<% if @total_count < 1 %>
+ <%= render partial: "organisations/headings", locals: { main: "There are no more logs that need updating", sub: "" } %>
+
+ You’ve completed all the logs that were affected by scheme changes.
+
+
+ <%= govuk_button_link_to "Back to all logs", lettings_logs_path %>
+
+<% else %>
+ <%= render partial: "organisations/headings", locals: { main: "You need to update #{@total_count} logs", sub: "" } %>
-<%= govuk_table do |table| %>
- <% table.head do |head| %>
- <% head.row do |row| %>
- <% row.cell(header: true, text: "Log ID") %>
- <% row.cell(header: true, text: "Tenancy code") %>
- <% row.cell(header: true, text: "Property reference") %>
- <% row.cell(header: true, text: "Status") %>
- <% row.cell(header: true, text: "") %>
+ <%= govuk_table do |table| %>
+ <% table.head do |head| %>
+ <% head.row do |row| %>
+ <% row.cell(header: true, text: "Log ID") %>
+ <% row.cell(header: true, text: "Tenancy code") %>
+ <% row.cell(header: true, text: "Property reference") %>
+ <% row.cell(header: true, text: "Status") %>
+ <% row.cell(header: true, text: "") %>
+ <% end %>
<% end %>
- <% end %>
- <% @logs.each do |log| %>
- <% table.body do |body| %>
- <% body.row do |row| %>
- <% row.cell(text: log.id) %>
- <% row.cell(text: log.tenancycode) %>
- <% row.cell(text: log.propcode) %>
- <% row.cell(text: status_tag(log.status)) %>
- <% row.cell(html_attributes: {
- scope: "row",
- class: "govuk-!-text-align-right",
- }) do %>
- <%= govuk_link_to("Update now", send("lettings_log_#{log.form.get_question('startdate', log).page.id}_path", log)) %>
+ <% @logs.each do |log| %>
+ <% table.body do |body| %>
+ <% body.row do |row| %>
+ <% row.cell(text: log.id) %>
+ <% row.cell(text: log.tenancycode) %>
+ <% row.cell(text: log.propcode) %>
+ <% row.cell(text: status_tag(log.status)) %>
+ <% row.cell(html_attributes: {
+ scope: "row",
+ class: "govuk-!-text-align-right",
+ }) do %>
+ <%= govuk_link_to("Update now", send("lettings_log_#{log.form.get_question('startdate', log).page.id}_path", log)) %>
+ <% end %>
<% end %>
<% end %>
<% end %>
- <% end %>
+ <% end %>
<% end %>
<%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb
index 3c215b557..150dfe735 100644
--- a/spec/requests/lettings_logs_controller_spec.rb
+++ b/spec/requests/lettings_logs_controller_spec.rb
@@ -828,6 +828,14 @@ RSpec.describe LettingsLogsController, type: :request do
expect(page).not_to have_content(affected_lettings_logs.first.id)
expect(page).to have_content("You need to update 2 logs")
end
+
+ it "displays correct content when there are no unresolved logs" do
+ LettingsLog.where(unresolved: true).update!(unresolved: false)
+ get "/lettings-logs/update-logs", headers:, params: {}
+ expect(page).to have_content("There are no more logs that need updating")
+ expect(page).to have_content("You’ve completed all the logs that were affected by scheme changes.")
+ page.assert_selector(".govuk-button", text: "Back to all logs")
+ end
end
context "when viewing a specific log affected by deactivated location" do