diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-02-28 05:46:33 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-02-28 05:46:33 +0000 |
| commit | df3c2466f8ca1af5e97eb5f92e10e2d5f20e2a2c (patch) | |
| tree | d108047cec7f6f5b176ee6da2705d4909395ceb9 /app | |
| parent | c0048f79544c0f3ddfc95017531aca520e938d8c (diff) | |
| download | redmine-df3c2466f8ca1af5e97eb5f92e10e2d5f20e2a2c.tar.gz redmine-df3c2466f8ca1af5e97eb5f92e10e2d5f20e2a2c.zip | |
Implements the behaviour expected in user_test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9029 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9b0ab8110..9ac5a4fd0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -132,7 +132,8 @@ class User < Principal def self.try_to_login(login, password) # Make sure no one can sign in with an empty password return nil if password.to_s.empty? - user = find_by_login(login) + matches = find_all_by_login(login) + user = (matches.size < 2 ? matches.first : matches.detect {|u| u.login == login}) if user # user is already in local database return nil if !user.active? |