Replace creation_ip with creation_address

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fc893c9c3194f6c40a65ce61e1d73e9824ba0747..63a83ad1da8ad9803c3980ade89dbe0755398bea 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -36,7 +36,7 @@ class UsersController < ApplicationController
 
       users = User.all
       users = users.where(:status => @params[:status]) if @params[:status]
-      users = users.where(:creation_ip => @params[:ip]) if @params[:ip]
+      users = users.where(:creation_address => @params[:ip]) if @params[:ip]
 
       @users_count = users.limit(501).count
       @users_count = I18n.t("count.at_least_pattern", :count => 500) if @users_count > 500
@@ -268,7 +268,6 @@ class UsersController < ApplicationController
   def save_new_user(email_hmac, referer = nil)
     current_user.data_public = true
     current_user.description = "" if current_user.description.nil?
-    current_user.creation_ip = request.remote_ip
     current_user.creation_address = request.remote_ip
     current_user.languages = http_accept_language.user_preferred_languages
     current_user.terms_agreed = Time.now.utc

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index ef50ccaf2fb4bffa27c19ce8950fbbd6b7e13209..2fb14b6bdf7056f2196e4c476905f49480e0d758 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -4,10 +4,10 @@
   </td>
   <td>
     <p>
-      <% if user.creation_ip %>
+      <% if user.creation_address %>
         <%= t "users.index.summary_html",
               :name => link_to(user.display_name, user),
-              :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
+              :ip_address => link_to(user.creation_address, :ip => user.creation_address),
               :date => l(user.created_at, :format => :friendly) %>
       <% else %>
         <%= t "users.index.summary_no_ip_html",

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 44319b384f4ac313b39502b99150e05d2ce08ef8..d479b1d56dad13e0ab1e94e5188f8b6331ccf2cd 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -217,9 +217,9 @@
             <dl class="list-inline">
               <dt class="list-inline-item m-0"><%= t ".email address" %></dt>
               <dd class="list-inline-item"><%= @user.email %></dd>
-              <% unless @user.creation_ip.nil? -%>
+              <% unless @user.creation_address.nil? -%>
                 <dt class="list-inline-item m-0"><%= t ".created from" %></dt>
-                <dd class="list-inline-item"><%= link_to @user.creation_ip, users_path(:ip => @user.creation_ip) %></dd>
+                <dd class="list-inline-item"><%= link_to @user.creation_address, users_path(:ip => @user.creation_address) %></dd>
               <% end -%>
               <dt class="list-inline-item m-0"><%= t ".status" %></dt>
               <dd class="list-inline-item"><%= link_to @user.status.capitalize, users_path(:status => @user.status) %></dd>

diff --git a/script/update-spam-blocks b/script/update-spam-blocks
index b5656f6ac0b5b7aad20208084b990789985fdc9b..7d665454582a842ebb09d6bf2d313dcee955a64d 100755 (executable)
--- a/script/update-spam-blocks
+++ b/script/update-spam-blocks
@@ -8,7 +8,7 @@ addresses = User.count(
     :status => %w[suspended deleted],
     :creation_time => Time.now.utc - 28.days..Time.now.utc
   },
-  :group => :creation_ip
+  :group => :creation_address
 )
 
 addresses.each do |address, count|

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 4f4edf10b034a82ad562b995bbb5328ab6db0382..dda157f01552cbcbc62664b64183d9e83ed56ae8 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -476,7 +476,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     moderator_user = create(:moderator_user)
     administrator_user = create(:administrator_user)
     _suspended_user = create(:user, :suspended)
-    _ip_user = create(:user, :creation_ip => "1.2.3.4")
+    _ip_user = create(:user, :creation_address => "1.2.3.4")
 
     # There are now 7 users - the five above, plus two extra "granters" for the
     # moderator_user and administrator_user