Merge remote-tracking branch 'upstream/pull/3404'

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4f05ece74bc0c451b487de11655e7d847057380d..f7a82c08c6c9df94c00f0b8c6b8be42e19d0c335 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -208,9 +208,9 @@ class UsersController < ApplicationController
   end
 
   ##
-  # delete a user, marking them as deleted and removing personal data
+  # destroy a user, marking them as deleted and removing personal data
   def destroy
-    @user.delete
+    @user.destroy
     redirect_to user_path(:display_name => params[:display_name])
   end
 

diff --git a/app/models/user.rb b/app/models/user.rb
index abd001f0647b95e6d774bf7b849f459a59576dd8..8c75b4ef45e7ad4fd608a4fd59c2ecb7a332b538 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -113,7 +113,8 @@ class User < ApplicationRecord
   validates_email_format_of :email, :if => proc { |u| u.email_changed? }
   validates_email_format_of :new_email, :allow_blank => true, :if => proc { |u| u.new_email_changed? }
 
-  after_initialize :set_defaults
+  alias_attribute :created_at, :creation_time
+
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
@@ -240,8 +241,8 @@ class User < ApplicationRecord
   end
 
   ##
-  # delete a user - leave the account but purge most personal data
-  def delete
+  # destroy a user - leave the account but purge most personal data
+  def destroy
     avatar.purge_later
 
     self.display_name = "user_#{id}"
@@ -307,7 +308,7 @@ class User < ApplicationRecord
   end
 
   def max_messages_per_hour
-    account_age_in_seconds = Time.now.utc - creation_time
+    account_age_in_seconds = Time.now.utc - created_at
     account_age_in_hours = account_age_in_seconds / 3600
     recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
@@ -316,7 +317,7 @@ class User < ApplicationRecord
   end
 
   def max_friends_per_hour
-    account_age_in_seconds = Time.now.utc - creation_time
+    account_age_in_seconds = Time.now.utc - created_at
     account_age_in_hours = account_age_in_seconds / 3600
     recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
@@ -326,10 +327,6 @@ class User < ApplicationRecord
 
   private
 
-  def set_defaults
-    self.creation_time = Time.now.getutc unless attribute_present?(:creation_time)
-  end
-
   def encrypt_password
     if pass_crypt_confirmation
       self.pass_crypt, self.pass_salt = PasswordHash.create(pass_crypt)

diff --git a/app/views/api/users/_user.json.jbuilder b/app/views/api/users/_user.json.jbuilder
index 7659e4e110c5b40667cb681b21fb116f48295913..15f0685ac9e24b9131b75ab2389a73c04157e008 100644 (file)
--- a/app/views/api/users/_user.json.jbuilder
+++ b/app/views/api/users/_user.json.jbuilder
@@ -1,7 +1,7 @@
 json.user do
   json.id user.id
   json.display_name user.display_name
-  json.account_created user.creation_time.xmlschema
+  json.account_created user.created_at.xmlschema
   json.description user.description if user.description
 
   if current_user && current_user == user && can?(:details, User)

diff --git a/app/views/api/users/_user.xml.builder b/app/views/api/users/_user.xml.builder
index 7d6b177f2f6db76d6d8222dd9918fc5b6d6efa7b..1791c60ef96fb0cf78d876106ed07c2b836b7135 100644 (file)
--- a/app/views/api/users/_user.xml.builder
+++ b/app/views/api/users/_user.xml.builder
@@ -1,6 +1,6 @@
 xml.tag! "user", :id => user.id,
                  :display_name => user.display_name,
-                 :account_created => user.creation_time.xmlschema do
+                 :account_created => user.created_at.xmlschema do
   xml.tag! "description", user.description if user.description
   if current_user && current_user == user && can?(:details, User)
     xml.tag! "contributor-terms", :agreed => user.terms_agreed.present?,

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index f01f8d1edce3d26bbe959e614df08df18d37639e..e419aed1d43d2b22d7cde109f4fef91d45ab2391 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -8,11 +8,11 @@
         <%= t "users.index.summary_html",
               :name => link_to(user.display_name, user_path(user)),
               :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
-              :date => l(user.creation_time, :format => :friendly) %>
+              :date => l(user.created_at, :format => :friendly) %>
       <% else %>
         <%= t "users.index.summary_no_ip_html",
               :name => link_to(user.display_name, user_path(user)),
-              :date => l(user.creation_time, :format => :friendly) %>
+              :date => l(user.created_at, :format => :friendly) %>
       <% end %>
     </p>
     <div class="richtext text-break"><%= user.description.to_html %></div>

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b55e61f26d48a412e62a526c2dc61925f17a7264..95878402bde87eb4e415a6098ff523aec17f4178 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -120,7 +120,7 @@
         <small>
           <dl class="dl-inline">
             <dt><%= t ".mapper since" %></dt>
-            <dd><%= l @user.creation_time.to_date, :format => :long %></dd>
+            <dd><%= l @user.created_at.to_date, :format => :long %></dd>
             <% unless @user.terms_agreed %>
               <dt><%= t ".ct status" %></dt>
               <dd>

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index 135e49d3f2354c7635516328d9d378a1e957562d..d9f4401bfbf83e61ddd5d6a54c944e715754a816 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -161,7 +161,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
     assert_select "div.note-comments ul li", :count => 2
     assert_select "div.details", /Resolved by #{user.display_name}/
 
-    user.delete
+    user.destroy
 
     reset!
 

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index c34b4b81fe310f092b02088ce8b321711ad45865..76f5200912bee738cd54cdec5574bc1db1ff2119 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -256,9 +256,9 @@ class UserTest < ActiveSupport::TestCase
     assert create(:moderator_user).has_role?("moderator")
   end
 
-  def test_delete
+  def test_destroy
     user = create(:user, :with_home_location, :description => "foo")
-    user.delete
+    user.destroy
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?
     assert_nil user.home_lat