diff --git a/app/models/person.rb b/app/models/person.rb index aefbc6d5f..63da72145 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -22,20 +22,13 @@ class Person key :owner_id, ObjectId one :profile, :class_name => 'Profile' - validate :profile_is_valid + validates_associated :profile before_save :downcase_diaspora_handle - def downcase_diaspora_handle diaspora_handle.downcase! end - def profile_is_valid - if profile.present? && !profile.valid? - profile.errors.full_messages.each { |m| errors.add(:base, m) } - end - end - many :albums, :class_name => 'Album', :foreign_key => :person_id belongs_to :owner, :class_name => 'User' diff --git a/app/models/user.rb b/app/models/user.rb index 5c6cd00d8..9a077bd40 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -42,14 +42,9 @@ class User validates_format_of :username, :with => /\A[A-Za-z0-9_.]+\z/ validates_presence_of :person, :unless => proc {|user| user.invitation_token.present?} validates_inclusion_of :language, :in => AVAILABLE_LANGUAGE_CODES + validates_associated :person one :person, :class_name => 'Person', :foreign_key => :owner_id - validates_associated :person - def person_is_valid - if person.present? && !person.valid? - person.errors.full_messages.each {|m| errors.add(:base, m)} - end - end many :inviters, :in => :inviter_ids, :class_name => 'User' many :friends, :in => :friend_ids, :class_name => 'Contact'