baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Rubocop

pull/155/head
baarkerlounger 3 years ago
parent
fb0b2aa246
commit
5e0cf43a30
6 changed files with 8 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      app/helpers/application_helper.rb
  2. 4
      app/models/bulk_upload.rb
  3. 2
      app/views/layouts/application.html.erb
  4. 2
      config/environments/production.rb
  5. 2
      config/environments/sandbox.rb
  6. 2
      config/initializers/active_admin.rb

16
app/helpers/application_helper.rb
Unescape View File

@ -1,21 +1,9 @@
module ApplicationHelper module ApplicationHelper
def browser_title(title) def browser_title(title, *resources)
if user_log_errors || case_log_errors || resource_errors if resources.any? { |r| r.present? && r.errors.present? }
"Error: #{[title, t('service_name'), 'GOV.UK'].select(&:present?).join(' - ')}" "Error: #{[title, t('service_name'), 'GOV.UK'].select(&:present?).join(' - ')}"
else else
[title, t("service_name"), "GOV.UK"].select(&:present?).join(" - ") [title, t("service_name"), "GOV.UK"].select(&:present?).join(" - ")
end end
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 end

4
app/models/bulk_upload.rb
Unescape View File

@ -27,8 +27,8 @@ class BulkUpload
data_range = FIRST_DATA_ROW..last_row data_range = FIRST_DATA_ROW..last_row
data_range.map do |row_num| data_range.map do |row_num|
row = sheet.row(row_num) row = sheet.row(row_num)
owning_organisation = Organisation.find(row[111]) # owning_organisation = Organisation.find(row[111])
managing_organisation = Organisation.find(row[113]) # managing_organisation = Organisation.find(row[113])
case_log = CaseLog.create!( case_log = CaseLog.create!(
owning_organisation: current_user.organisation, owning_organisation: current_user.organisation,
managing_organisation: current_user.organisation, managing_organisation: current_user.organisation,

2
app/views/layouts/application.html.erb
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" class="govuk-template"> <html lang="en" class="govuk-template">
<head> <head>
<title><%= browser_title(yield(:title)) %></title> <title><%= browser_title(yield(:title), @user, @organisation, @case_log, @resource) %></title>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<%= csp_meta_tag %> <%= csp_meta_tag %>
<%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %> <%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>

2
config/environments/production.rb
Unescape View File

@ -58,7 +58,7 @@ Rails.application.configure do
config.action_mailer.perform_caching = false 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.delivery_method = :smtp
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
address: "smtp.gmail.com", address: "smtp.gmail.com",

2
config/environments/sandbox.rb
Unescape View File

@ -58,7 +58,7 @@ Rails.application.configure do
config.action_mailer.perform_caching = false 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.delivery_method = :smtp
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
address: "smtp.gmail.com", address: "smtp.gmail.com",

2
config/initializers/active_admin.rb
Unescape View File

@ -338,5 +338,5 @@ end
# delete this when the next version bump is released but for now it prevents # delete this when the next version bump is released but for now it prevents
# webpacker issues. # webpacker issues.
Rails.application.config.after_initialize do Rails.application.config.after_initialize do
ActiveAdmin.application.stylesheets.delete('active_admin/print.css') ActiveAdmin.application.stylesheets.delete("active_admin/print.css")
end end

Write Preview
Loading…
Cancel
Save