[PATCH] BZ#740476 Successful login is not getting updated in login count.

Both basic and ldap based authentication were not incrementing the login count for the successfully authenticated user. --- src/app/models/user.rb | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/models/user.rb b/src/app/models/user.rb index 0c4f14c..ed7f4db 100644 --- a/src/app/models/user.rb +++ b/src/app/models/user.rb @@ -95,23 +95,27 @@ class User < ActiveRecord::Base # FIXME: this is because of tests - encrypted password is submitted, # don't know how to get unencrypted version (from factorygirl) if password.length == 192 and password == u.crypted_password - return u + u.login_count += 1 elsif Password.check(password, u.crypted_password) - return u + u.login_count += 1 else u.failed_login_count += 1 u.save! - return nil + u = nil end + u.save! unless u.nil? + return u end def self.authenticate_using_ldap(username, password) if Ldap.valid_ldap_authentication?(username, password, SETTINGS_CONFIG[:auth][:ldap]) u = User.find_by_login(username) || create_ldap_user!(username) - return u + u.login_count += 1 else - return nil + u = nil end + u.save! unless u.nil? + return u end def check_password? -- 1.7.6.2