app/models/user.rb in wheels-0.1.13 vs app/models/user.rb in wheels-0.1.14

- old
+ new

@@ -2,16 +2,19 @@ belongs_to :role has_many :blogs, :dependent => :destroy has_one :profile, :dependent => :destroy has_many :galleries, :dependent => :destroy has_many :access_control_entries, :dependent=>:destroy + before_create :create_profile + form_attributes( {"Edit your profile" => :profile_attributes}, + {"Change your password" => [:old_password, :new_password, {"Re-type password"=>:password_confirmation}]}) + accepts_nested_attributes_for :profile def initialize(*args) super(*args) - build_profile unless profile end def self.nobody User.new(:role=>Role.nobody) end @@ -19,12 +22,14 @@ def self.root User.where(:role_id=>Role.root.id)[0] end def create_profile - - Profile.create(:user=>self) unless self.profile + unless self.profile + build_profile(:alias=>email) + profile.save + end end def role?(role) if role.kind_of?(Role) return role==self.role @@ -61,9 +66,10 @@ User end attr_accessor :old_password validates :email, :presence => true, :email => true validates :old_password, :presence=>true , :password=>true - validates :password, :presence=>true , :length=>{:minimum=>6} + validates :password, :length=>{:minimum=>6} validates :password_confirmation, :equal_to=>{:other=>:password} + validates :phone, :phone=>true end