erblint: avoid dynamic find_by methods

diff --git a/.erb-lint.yml b/.erb-lint.yml
index d0ccb0c0df908945d325a9cc1ffed501141c5e8b..3cca0301cf8317bf42c610eae2aaef6b17390c88 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -25,8 +25,6 @@ linters:
         Enabled: false
       Rails/OutputSafety:
         Enabled: false
         Enabled: false
       Rails/OutputSafety:
         Enabled: false

-      Rails/DynamicFindBy:
-        Enabled: false # TODO

       Layout/LeadingBlankLines:
         Enabled: false # TODO
 exclude:
       Layout/LeadingBlankLines:
         Enabled: false # TODO
 exclude:

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index 745fb20124aca6400c2eaef4a8bfad3752517900..3ebcf7fabf1100233d6614a266b77094fb092be2 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">
 <%= javascript_include_tag "edit/potlatch" %>
 
 <div id="map">

-  <% session[:token] = current_user.tokens.create.token unless session[:token] && 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 -%>
   <% 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 bb6d3f81e274e2bdd153ab53df69159aec92c5a3..11519c26e9515b961edca70b86bd66d1baf906b5 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">
 <%= javascript_include_tag "edit/potlatch2" %>
 
 <div id="map">

-  <% session[:token] = current_user.tokens.create.token unless session[:token] && 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 -%>
   <% data = { :token => session[:token] } -%>
   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>