jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #61: Editing your profile always sets your password to blank.

Browse Source
This commit is contained in:
albert
2011-09-14 13:25:46 -04:00
parent 3a111122f5
commit a85374b56d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/user.rb
View File

@@ -19,7 +19,7 @@ class User < ActiveRecord::Base
validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons" validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons"
validates_uniqueness_of :name, :case_sensitive => false, :on => :create validates_uniqueness_of :name, :case_sensitive => false, :on => :create
validates_uniqueness_of :email, :case_sensitive => false, :on => :create, :if => lambda {|rec| !rec.email.blank?} validates_uniqueness_of :email, :case_sensitive => false, :on => :create, :if => lambda {|rec| !rec.email.blank?}
validates_length_of :password, :minimum => 5, :if => lambda {|rec| rec.new_record? || !rec.password.blank?} validates_length_of :password, :minimum => 5, :if => lambda {|rec| rec.new_record? || rec.password.present?}
validates_inclusion_of :default_image_size, :in => %w(medium large original) validates_inclusion_of :default_image_size, :in => %w(medium large original)
validates_confirmation_of :password validates_confirmation_of :password
validates_presence_of :email, :if => lambda {|rec| rec.new_record? && Danbooru.config.enable_email_verification?} validates_presence_of :email, :if => lambda {|rec| rec.new_record? && Danbooru.config.enable_email_verification?}
@@ -100,7 +100,8 @@ class User < ActiveRecord::Base
module PasswordMethods module PasswordMethods
def encrypt_password def encrypt_password
self.password_hash = self.class.sha1(password) if password puts password.inspect
self.password_hash = self.class.sha1(password) if password.present?
end end
def reset_password def reset_password