X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/254ce1eca0052a004a24065d247e55b8fe5b7675..7499fbc6e43897d30e088f14391c1203777cf929:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 9a1106972..ae5b0b74f 100644
--- 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 :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'
@@ -122,10 +125,6 @@ class User < ActiveRecord::Base
     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}"