0
0
Fork 0

there is no preset?

This commit is contained in:
Gibheer 2012-01-30 21:41:20 +01:00
parent 18281e5098
commit 3c2d0d32d9
1 changed files with 2 additions and 2 deletions

View File

@ -32,7 +32,7 @@ class Account
#
def self.authenticate(username, password)
account = first(:conditions => { :username => username }) unless username.nil?
account && account.has_password?(password) ? account : nil
(account && account.has_password?(password)) ? account : nil
end
##
@ -48,7 +48,7 @@ class Account
private
def password_required
crypted_password.nil? || password.present?
crypted_password.nil? || password
end
def encrypt_password