Error prefix code review changes

3 years ago · 84d8d6ee95
2 changed files with 18 additions and 10 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -1,5 +1,21 @@
 module ApplicationHelper
  def browser_title(title)
-    [title, t("service_name"), "GOV.UK"].select(&:present?).join(" - ")
+    if user_log_errors || case_log_errors || resource_errors
+      ["Error", title, t("service_name"), "GOV.UK"].select(&:present?).join(" - ")
+    else
+      [title, t("service_name"), "GOV.UK"].select(&:present?).join(" - ")
+    end
+  end
+
+  def user_log_errors
+    @user.present? && @user.errors.present?
+  end
+
+  def case_log_errors
+    @case_log.present? && @case_log.errors.present?
+  end
+
+  def resource_errors
+    @resource.present? && @resource.errors.present?
  end
 end
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -1,15 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" class="govuk-template">
  <head>
-    <% if @resource.present? && @resource.errors.present? %>
-      <title><%= browser_title("Error: #{yield(:title)}") %></title>
-    <% elsif @user.present? && @user.errors.present? %>
-      <title><%= browser_title("Error: #{yield(:title)}") %></title>
-    <% elsif @case_log.present? && @case_log.errors.present?%>
-      <title><%= browser_title("Error: #{yield(:title)}") %></title>
-    <% else %>
-      <title><%= browser_title(yield(:title)) %></title>
-    <% end %>
+    <title><%= browser_title(yield(:title)) %></title>
    <%= csrf_meta_tags %>
    <%= csp_meta_tag %>
    <%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>