erblint: prefer symbolic logical operators over and/or/not

diff --git a/.erb-lint.yml b/.erb-lint.yml
index ac8dbb95d9235a9c7ba7a95146b082fe6067bef9..9c3d6b0824a8df1960f1d8aa7ff6093c459836a7 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -27,8 +27,6 @@ linters:
         Enabled: false
       Rails/DynamicFindBy:
         Enabled: false # TODO
-      Style/AndOr:
-        Enabled: false # TODO
       Style/WordArray:
         Enabled: false # TODO
       Layout/LeadingBlankLines:
@@ -39,8 +37,6 @@ linters:
         Enabled: false # TODO
       Style/SymbolProc:
         Enabled: false # TODO
-      Style/Not:
-        Enabled: false # TODO
       Style/NegatedIf:
         Enabled: false # TODO
       Style/ConditionalAssignment:

diff --git a/app/views/messages/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb
index 565a52ddfd466c47331ce151a8ca0abdbee60344..e69f43699cf037e6337f7611240e8d1340e3ac8e 100644 (file)
--- a/app/views/messages/_message_summary.html.erb
+++ b/app/views/messages/_message_summary.html.erb
@@ -1,4 +1,4 @@
-<tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" if not message_summary.message_read? %>">
+<tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" if !message_summary.message_read? %>">
   <td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %></td>
   <td class="inbox-subject"><%= link_to h(message_summary.title), message_path(message_summary) %></td>
   <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index 5b59f5f2427527b461e4d4a4484f031f919657a2..745fb20124aca6400c2eaef4a8bfad3752517900 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,7 +1,7 @@
 <%= javascript_include_tag "edit/potlatch" %>
 
 <div id="map">
-  <% session[:token] = current_user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%>
+  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by_token(session[:token]) -%>
   <% data = { :token => session[:token] } -%>
   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index eb2a593768330017bf8d4577006a9c438c2feeda..bb6d3f81e274e2bdd153ab53df69159aec92c5a3 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -1,7 +1,7 @@
 <%= javascript_include_tag "edit/potlatch2" %>
 
 <div id="map">
-  <% session[:token] = current_user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%>
+  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by_token(session[:token]) -%>
   <% data = { :token => session[:token] } -%>
   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 8687bc29ebff1b798a6412409e18ab061369eb7c..15d3c970f68cba751b7f6d7d8a68ffb9b04ac9a0 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -4,7 +4,7 @@
 <% end %>
 
 <% unless @user_blocks.empty? %>
-<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => false } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user && current_user.moderator?), :show_user_name => true, :show_creator_name => false } %>
 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 1a74ba560f47884c7754e3d0c2f410e3f7cc7dde..004a967b0fbf6dbe2cf47a8fdcf86212a24e8a52 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -3,7 +3,7 @@
   <h1><%= raw(t(".heading", :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
 <% end %>
 <% unless @user_blocks.empty? %>
-<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => false, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user && current_user.moderator?), :show_user_name => false, :show_creator_name => true } %>
 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index ff019b293df4ac7996c1b136619e7cfbc081434e..42e75ecf0a5597685a62508820baa2c6ea7cee6d 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -4,7 +4,7 @@
 <% end %>
 
 <% unless @user_blocks.empty? %>
-<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user && current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>
 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>