diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 044f890e3..1e8f2a07d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,21 +1,9 @@
module ApplicationHelper
- def browser_title(title)
- if user_log_errors || case_log_errors || resource_errors
+ def browser_title(title, *resources)
+ if resources.any? { |r| r.present? && r.errors.present? }
"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
diff --git a/app/models/bulk_upload.rb b/app/models/bulk_upload.rb
index 4eb558c10..c7f211064 100644
--- a/app/models/bulk_upload.rb
+++ b/app/models/bulk_upload.rb
@@ -27,8 +27,8 @@ class BulkUpload
data_range = FIRST_DATA_ROW..last_row
data_range.map do |row_num|
row = sheet.row(row_num)
- owning_organisation = Organisation.find(row[111])
- managing_organisation = Organisation.find(row[113])
+ # owning_organisation = Organisation.find(row[111])
+ # managing_organisation = Organisation.find(row[113])
case_log = CaseLog.create!(
owning_organisation: current_user.organisation,
managing_organisation: current_user.organisation,
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3273c8ca3..90dae2d62 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
- <%= browser_title(yield(:title)) %>
+ <%= browser_title(yield(:title), @user, @organisation, @case_log, @resource) %>
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
<%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 9360f39c1..513645019 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -58,7 +58,7 @@ Rails.application.configure do
config.action_mailer.perform_caching = false
- config.action_mailer.default_url_options = { host: ENV['APP_HOST'], port: 3000 }
+ config.action_mailer.default_url_options = { host: ENV["APP_HOST"], port: 3000 }
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
address: "smtp.gmail.com",
diff --git a/config/environments/sandbox.rb b/config/environments/sandbox.rb
index 9360f39c1..513645019 100644
--- a/config/environments/sandbox.rb
+++ b/config/environments/sandbox.rb
@@ -58,7 +58,7 @@ Rails.application.configure do
config.action_mailer.perform_caching = false
- config.action_mailer.default_url_options = { host: ENV['APP_HOST'], port: 3000 }
+ config.action_mailer.default_url_options = { host: ENV["APP_HOST"], port: 3000 }
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
address: "smtp.gmail.com",
diff --git a/config/initializers/active_admin.rb b/config/initializers/active_admin.rb
index b3a9e16af..47561059e 100644
--- a/config/initializers/active_admin.rb
+++ b/config/initializers/active_admin.rb
@@ -338,5 +338,5 @@ end
# delete this when the next version bump is released but for now it prevents
# webpacker issues.
Rails.application.config.after_initialize do
- ActiveAdmin.application.stylesheets.delete('active_admin/print.css')
+ ActiveAdmin.application.stylesheets.delete("active_admin/print.css")
end