Merge r17285 from the oauth branch - allow flash access to set headers, even when...

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 9a1106972d63d767c2b2806f3eb5a921d4e1577e..9d7d233b7276f612eb420f56e4991e741e6c3aee 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,6 +11,9 @@ class User < ActiveRecord::Base
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets
 
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets
 

+  has_many :client_applications
+  has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
+

   validates_presence_of :email, :display_name
   validates_confirmation_of :email#, :message => ' addresses must match'
   validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
   validates_presence_of :email, :display_name
   validates_confirmation_of :email#, :message => ' addresses must match'
   validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'


@@ -30,7 +33,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.getutc if self.creation_time.nil?
+    self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)

   end
 
   def encrypt_password
   end
 
   def encrypt_password


@@ -122,10 +125,6 @@ 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}"
   def delete
     self.active = false
     self.display_name = "user_#{self.id}"