Move user images to Active Storage with paperclip as a fallback

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 1d008959905e85a50428c0433c04dbe16799d8a8..13248e4fb4c4136273b3b2028fe272bbdfea6a12 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -85,6 +85,8 @@ class User < ActiveRecord::Base
   scope :active, -> { where(:status => %w[active confirmed]) }
   scope :identifiable, -> { where(:data_public => true) }
 
   scope :active, -> { where(:status => %w[active confirmed]) }
   scope :identifiable, -> { where(:data_public => true) }
 

+  has_one_attached :avatar
+

   has_attached_file :image,
                     :default_url => "/assets/:class/:attachment/:style.png",
                     :styles => { :large => "100x100>", :small => "50x50>" }
   has_attached_file :image,
                     :default_url => "/assets/:class/:attachment/:style.png",
                     :styles => { :large => "100x100>", :small => "50x50>" }


@@ -267,6 +269,8 @@ class User < ActiveRecord::Base
   ##
   # delete a user - leave the account but purge most personal data
   def delete
   ##
   # delete a user - leave the account but purge most personal data
   def delete

+    avatar.purge
+

     self.display_name = "user_#{id}"
     self.description = ""
     self.home_lat = nil
     self.display_name = "user_#{id}"
     self.description = ""
     self.home_lat = nil


@@ -277,6 +281,7 @@ class User < ActiveRecord::Base
     self.auth_provider = nil
     self.auth_uid = nil
     self.status = "deleted"
     self.auth_provider = nil
     self.auth_uid = nil
     self.status = "deleted"

+

     save
   end
 
     save
   end