X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52be0e81a0d8fb30a635b32f85d4465fc0578067..1340fca8f17e4e3cce211e6eafed18cde7f57386:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index cc5389663..0c9e76d54 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -41,10 +41,15 @@ class User < ActiveRecord::Base
   validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
   validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
 
+  attr_accessible :display_name, :email, :email_confirmation, :openid_url,
+                  :pass_crypt, :pass_crypt_confirmation, :consider_pd
+
   after_initialize :set_creation_time
   before_save :encrypt_password
 
-  file_column :image, :magick => { :geometry => "100x100>" }
+  has_attached_file :image, 
+    :default_url => "/assets/:class/:attachment/:style.png",
+    :styles => { :large => "100x100>", :small => "50x50>" }
 
   def self.authenticate(options)
     if options[:username] and options[:password]