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

refactor: erblinting

pull/1034/head
natdeanlewissoftwire 4 years ago
parent
a09abb29f0
commit
911576574f
5 changed files with 21 additions and 12 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. 12
      app/views/locations/index.html.erb
  2. 4
      app/views/locations/local_authority.html.erb
  3. 5
      app/views/locations/name.html.erb
  4. 2
      app/views/locations/postcode.html.erb

12
app/views/locations/index.html.erb
Unescape View File

@ -50,7 +50,11 @@
<% @locations.each do |location| %> <% @locations.each do |location| %>
<%= table.body do |body| %> <%= table.body do |body| %>
<%= body.row do |row| %> <%= body.row do |row| %>
<% row.cell(text: simple_format(location_cell_postcode(location, location.confirmed ? scheme_location_path(@scheme, location) : location.postcode.present? ? scheme_location_check_answers_path(@scheme, location, route: "locations") : scheme_location_postcode_path(@scheme, location)), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %> <% row.cell(text: simple_format(location_cell_postcode(location, if location.confirmed
scheme_location_path(@scheme, location)
else
location.postcode.present? ? scheme_location_check_answers_path(@scheme, location, route: "locations") : scheme_location_postcode_path(@scheme, location)
end), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
<% row.cell(text: location.id) %> <% row.cell(text: location.id) %>
<% row.cell(text: status_tag(location.status)) %> <% row.cell(text: status_tag(location.status)) %>
<% end %> <% end %>
@ -95,7 +99,11 @@
<%= table.body do |body| %> <%= table.body do |body| %>
<%= body.row do |row| %> <%= body.row do |row| %>
<% row.cell(text: location.id) %> <% row.cell(text: location.id) %>
<% row.cell(text: simple_format(location_cell_postcode(location, location.confirmed ? scheme_location_path(@scheme, location) : location.postcode.present? ? scheme_location_check_answers_path(@scheme, location, route: "locations") : scheme_location_postcode_path(@scheme, location)), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %> <% row.cell(text: simple_format(location_cell_postcode(location, if location.confirmed
scheme_location_path(@scheme, location)
else
location.postcode.present? ? scheme_location_check_answers_path(@scheme, location, route: "locations") : scheme_location_postcode_path(@scheme, location)
end), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
<% row.cell(text: location.units) %> <% row.cell(text: location.units) %>
<% row.cell do %> <% row.cell do %>
<span><%= simple_format(location.type_of_unit) %></span> <span><%= simple_format(location.type_of_unit) %></span>

4
app/views/locations/local_authority.html.erb
Unescape View File

@ -8,7 +8,7 @@
scheme_location_check_answers_path(@scheme, @location, route: params[:route]) scheme_location_check_answers_path(@scheme, @location, route: params[:route])
else else
scheme_location_postcode_path(@scheme, @location, route: params[:route], referrer: params[:referrer]) scheme_location_postcode_path(@scheme, @location, route: params[:route], referrer: params[:referrer])
end end,
) %> ) %>
<% end %> <% end %>
@ -27,7 +27,7 @@
"data-controller": %w[conditional-filter accessible-autocomplete] %> "data-controller": %w[conditional-filter accessible-autocomplete] %>
<div class="govuk-button-group"> <div class="govuk-button-group">
<% if params[:referrer] == "check_answers" || params[:referrer] == "check_local_authority"%> <% if params[:referrer] == "check_answers" || params[:referrer] == "check_local_authority" %>
<%= f.govuk_submit "Save changes" %> <%= f.govuk_submit "Save changes" %>
<%= govuk_button_link_to "Cancel", scheme_location_check_answers_path(@scheme, @location, route: params[:route]), secondary: true %> <%= govuk_button_link_to "Cancel", scheme_location_check_answers_path(@scheme, @location, route: params[:route]), secondary: true %>
<% else %> <% else %>

5
app/views/locations/name.html.erb
Unescape View File

@ -3,9 +3,10 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: "Back", text: "Back",
href: if params[:referrer] == "check_answers" href: case params[:referrer]
when "check_answers"
scheme_location_check_answers_path(@scheme, @location, route: params[:route]) scheme_location_check_answers_path(@scheme, @location, route: params[:route])
elsif params[:referrer] == "details" when "details"
scheme_location_path(@scheme, @location) scheme_location_path(@scheme, @location)
else else
scheme_location_postcode_path(@scheme, @location, route: params[:route]) scheme_location_postcode_path(@scheme, @location, route: params[:route])

2
app/views/locations/postcode.html.erb
Unescape View File

@ -7,7 +7,7 @@
scheme_location_check_answers_path(@scheme, @location, route: params[:route]) scheme_location_check_answers_path(@scheme, @location, route: params[:route])
else else
scheme_locations_path(@scheme) scheme_locations_path(@scheme)
end end,
) %> ) %>
<% end %> <% end %>

Write Preview
Loading…
Cancel
Save