Improving friend capabilities so you can now add and remove friends as you wish....

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

diff --git a/app/models/user.rb b/app/models/user.rb
index ef8e8bbf70aca4a2215a6cf7758fac913d7b2e54..c4b81e7abdb66d26db556237e5500a670e9d2fc5 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,6 +9,7 @@ class User < ActiveRecord::Base
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
 
+  validates_presence_of :email, :display_name
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
@@ -16,6 +17,9 @@ class User < ActiveRecord::Base
   validates_length_of :display_name, :minimum => 3, :allow_nil => true
   validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
+  validates_numericality_of :home_lat, :allow_nil => true
+  validates_numericality_of :home_lon, :allow_nil => true
+  validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
 
   before_save :encrypt_password
 
@@ -89,7 +93,7 @@ class User < ActiveRecord::Base
     res = false
     @new_friend = new_friend
     self.friends.each do |friend|
-      if friend.user_id == @new_friend.user_id
+      if friend.friend_user_id == @new_friend.id
         return true
       end
     end