Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use downcast to search for email or login (in case of case sensitive db's).

Browse source
This commit is contained in:
Martin Edenhofer 2015-08-04 14:30:35 +02:00
parent 3491dcf043
commit ce9c5a0f46
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/import/otrs.rb
View file

@ -1116,7 +1116,7 @@ module Import::OTRS
} }
# check if customer already exists # check if customer already exists
user_old = User.where( login: user_new[:login] ).first user_old = User.where( login: user_new[:login].downcase ).first
# create / update agent # create / update agent
if user_old if user_old
@ -1304,9 +1304,9 @@ module Import::OTRS
end end
end end
user = User.where( email: email ).first user = User.where( email: email.downcase ).first
if !user if !user
user = User.where( login: email ).first user = User.where( login: email.downcase ).first
end end
if !user if !user
begin begin
@ -1334,7 +1334,7 @@ module Import::OTRS
) )
rescue ActiveRecord::RecordNotUnique rescue ActiveRecord::RecordNotUnique
log "User #{email} was handled by another thread, taking this." log "User #{email} was handled by another thread, taking this."
user = User.find_by( login: email ) user = User.find_by( login: email.downcase )
if !user if !user
log "User #{email} wasn't created sleep and retry." log "User #{email} wasn't created sleep and retry."
sleep rand 3 sleep rand 3