Browse Source

refactor: linting

pull/1034/head
natdeanlewissoftwire 4 years ago
parent
commit
2404b893ee
  1. 2
      app/helpers/locations_helper.rb
  2. 2
      app/models/location.rb
  3. 2
      app/views/locations/check_answers.html.erb

2
app/helpers/locations_helper.rb

@ -73,7 +73,7 @@ module LocationsHelper
attr[:value].blank? || (attr[:attribute] == "availability" && location.startdate.blank?) ? "Answer" : "Change" attr[:value].blank? || (attr[:attribute] == "availability" && location.startdate.blank?) ? "Answer" : "Change"
end end
private private
ActivePeriod = Struct.new(:from, :to) ActivePeriod = Struct.new(:from, :to)
def location_active_periods(location) def location_active_periods(location)

2
app/models/location.rb

@ -1,6 +1,6 @@
class Location < ApplicationRecord class Location < ApplicationRecord
validates :postcode, on: :postcode, presence: { message: I18n.t("validations.location.postcode_blank") } validates :postcode, on: :postcode, presence: { message: I18n.t("validations.location.postcode_blank") }
validate :validate_postcode, on: :postcode, if: Proc.new { |model| model.postcode.presence } validate :validate_postcode, on: :postcode, if: proc { |model| model.postcode.presence }
validates :location_admin_district, on: :location_admin_district, presence: { message: I18n.t("validations.location_admin_district") } validates :location_admin_district, on: :location_admin_district, presence: { message: I18n.t("validations.location_admin_district") }
validates :name, on: :name, presence: { message: I18n.t("validations.location.name") } validates :name, on: :name, presence: { message: I18n.t("validations.location.name") }
validates :units, on: :units, presence: { message: I18n.t("validations.location.units") } validates :units, on: :units, presence: { message: I18n.t("validations.location.units") }

2
app/views/locations/check_answers.html.erb

@ -22,7 +22,7 @@
<%= summary_list.row do |row| %> <%= summary_list.row do |row| %>
<% row.key { attr[:name] } %> <% row.key { attr[:name] } %>
<% row.value { details_html(attr) } %> <% row.value { details_html(attr) } %>
<% row.action(text: action_text_helper(attr, @location), href: location_edit_path(@location, attr[:attribute]))%> <% row.action(text: action_text_helper(attr, @location), href: location_edit_path(@location, attr[:attribute])) %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>

Loading…
Cancel
Save