From edea39d43121fa45aed961bf9d7f55179807411e Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 12 Feb 2015 00:04:46 +0100 Subject: [PATCH] Improved error handling. --- lib/import/otrs2.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/import/otrs2.rb b/lib/import/otrs2.rb index 6a91e7b5f..f653ed7de 100644 --- a/lib/import/otrs2.rb +++ b/lib/import/otrs2.rb @@ -971,6 +971,12 @@ module Import::OTRS2 # check if agent already exists user_old = User.where( :id => user_new[:id] ).first + # check if login is already used + login_in_use = User.where( "login = ? AND id != #{user_new[:id]}", user_new[:login].downcase ).count + if login_in_use > 0 + user_new[:login] = "#{user_new[:login]}_#{user_new[:id]}" + end + # create / update agent if user_old puts "update User.find(#{user_old[:id]})"