From 139808b58d37b1ce09ab951762fc2a76f8ed6fb8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 15 Aug 2015 09:28:34 +0000 Subject: [PATCH] Find user by login then by email. git-svn-id: http://svn.redmine.org/redmine/trunk@14506 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/principal.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/principal.rb b/app/models/principal.rb index 58a08b19e..c7addd9df 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -152,10 +152,9 @@ class Principal < ActiveRecord::Base return nil if keyword.blank? principal = nil - principal ||= principals.detect {|a| - keyword.casecmp(a.mail.to_s) == 0 || - keyword.casecmp(a.login.to_s) == 0 - } + principal ||= principals.detect {|a| keyword.casecmp(a.login.to_s) == 0} + principal ||= principals.detect {|a| keyword.casecmp(a.mail.to_s) == 0} + if principal.nil? && keyword.match(/ /) firstname, lastname = *(keyword.split) # "First Last Throwaway" principal ||= principals.detect {|a|