From 74b91c0e3e53b4b8da8d7f759ecca67ff5c39a7b Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 27 Mar 2019 10:30:48 +0100 Subject: [PATCH 1/1] erblint: Add or remove curly braces around hash parameters as required --- .erb-lint.yml | 2 -- app/views/browse/_common_details.html.erb | 2 +- app/views/browse/_node.html.erb | 2 +- app/views/browse/_relation_member.html.erb | 2 +- app/views/browse/_way.html.erb | 4 ++-- app/views/browse/changeset.html.erb | 6 +++--- app/views/diary_entries/comments.html.erb | 4 ++-- app/views/diary_entries/index.html.erb | 4 ++-- app/views/layouts/_head.html.erb | 18 +++++++++--------- app/views/layouts/_search.html.erb | 4 ++-- app/views/messages/_message_summary.html.erb | 6 +++--- .../messages/_sent_message_summary.html.erb | 2 +- app/views/notes/_notes_paging_nav.html.erb | 4 ++-- app/views/site/edit.html.erb | 2 +- app/views/site/export.html.erb | 2 +- app/views/traces/_trace.html.erb | 2 +- app/views/traces/_trace_paging_nav.html.erb | 4 ++-- app/views/traces/show.html.erb | 4 ++-- app/views/user_blocks/_blocks.html.erb | 4 ++-- app/views/user_blocks/show.html.erb | 2 +- app/views/users/account.html.erb | 4 ++-- app/views/users/login.html.erb | 4 ++-- app/views/users/lost_password.html.erb | 2 +- app/views/users/new.html.erb | 14 +++++++------- app/views/users/reset_password.html.erb | 4 ++-- 25 files changed, 53 insertions(+), 55 deletions(-) diff --git a/.erb-lint.yml b/.erb-lint.yml index 09e737b91..0861b74a2 100644 --- a/.erb-lint.yml +++ b/.erb-lint.yml @@ -27,8 +27,6 @@ linters: Enabled: false Style/StringLiterals: Enabled: false # TODO - Style/BracesAroundHashParameters: - Enabled: false # TODO Rails/DynamicFindBy: Enabled: false # TODO Style/AndOr: diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 3b3030abf..e035076b6 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -26,7 +26,7 @@ <% if @type == "node" and common_details.visible? %>
<%= t 'browse.location' %> - <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), { :controller => 'site', :action => 'index', :anchor => "map=18/#{common_details.lat}/#{common_details.lon}" }) %> + <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), :controller => 'site', :action => 'index', :anchor => "map=18/#{common_details.lat}/#{common_details.lon}") %>
<% end %> diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb index 873360bb2..e0eb55c1b 100644 --- a/app/views/browse/_node.html.erb +++ b/app/views/browse/_node.html.erb @@ -14,7 +14,7 @@

<%= t 'browse.part_of' %>

diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index 5b6b5c365..ef8c67e59 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -1,6 +1,6 @@ <% member_class = link_class(relation_member.member_type.downcase, relation_member.member) - linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) + linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) } type_str = t '.type.' + relation_member.member_type.downcase %>
  • diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 7099f015a..49a1bced1 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -22,10 +22,10 @@