kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails3: replace deprecated 'before_save' method at User model.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6923 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-08-31 16:06:36 +00:00
parent ac9d581970
commit 507192f167
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.rb
View File

@ -74,6 +74,7 @@ class User < Principal
validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
before_create :set_mail_notification before_create :set_mail_notification
before_save :update_hashed_password
before_destroy :remove_references_before_destroy before_destroy :remove_references_before_destroy
named_scope :in_group, lambda {|group| named_scope :in_group, lambda {|group|
@ -90,7 +91,7 @@ class User < Principal
true true
end end
def before_save def update_hashed_password
# update hashed_password if password was set # update hashed_password if password was set
if self.password && self.auth_source_id.blank? if self.password && self.auth_source_id.blank?
salt_password(password) salt_password(password)