meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Find user by login then by email.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14506 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-08-15 09:28:34 +00:00
parent 178a5e8e54
commit 139808b58d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/principal.rb
View File

@ -152,10 +152,9 @@ class Principal < ActiveRecord::Base
return nil if keyword.blank? return nil if keyword.blank?
principal = nil principal = nil
principal ||= principals.detect {|a| principal ||= principals.detect {|a| keyword.casecmp(a.login.to_s) == 0}
keyword.casecmp(a.mail.to_s) == 0 || principal ||= principals.detect {|a| keyword.casecmp(a.mail.to_s) == 0}
keyword.casecmp(a.login.to_s) == 0
}
if principal.nil? && keyword.match(/ /) if principal.nil? && keyword.match(/ /)
firstname, lastname = *(keyword.split) # "First Last Throwaway" firstname, lastname = *(keyword.split) # "First Last Throwaway"
principal ||= principals.detect {|a| principal ||= principals.detect {|a|