Eager load node and way details when processing a map call.

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 80faf68e9137c7ba60d2f75ef6073ed2f598e7d3..2adbbb9a19d729acdc5053f54171a1d2d96ee6f5 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,6 +9,7 @@ class User < ActiveRecord::Base
   has_many :friends, :include => :befriendee, :conditions => ["users.visible = ?", true]
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
   has_many :friends, :include => :befriendee, :conditions => ["users.visible = ?", true]
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"

+  has_many :changesets

 
   validates_presence_of :email, :display_name
   validates_confirmation_of :email, :message => 'Email addresses must match'
 
   validates_presence_of :email, :display_name
   validates_confirmation_of :email, :message => 'Email addresses must match'


@@ -29,7 +30,7 @@ class User < ActiveRecord::Base
   file_column :image, :magick => { :geometry => "100x100>" }
 
   def after_initialize
   file_column :image, :magick => { :geometry => "100x100>" }
 
   def after_initialize

-    self.creation_time = Time.now if self.creation_time.nil?
+    self.creation_time = Time.now.getutc if self.creation_time.nil?

   end
 
   def encrypt_password
   end
 
   def encrypt_password


@@ -105,4 +106,21 @@ class User < ActiveRecord::Base
     return false
   end
 
     return false
   end
 

+  def trace_public_default
+    return self.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"})
+  end
+
+  def delete
+    self.active = false
+    self.display_name = "user_#{self.id}"
+    self.description = ""
+    self.home_lat = nil
+    self.home_lon = nil
+    self.image = nil
+    self.email_valid = false
+    self.new_email = nil
+    self.visible = false
+    self.save
+  end
+

 end
 end