From d495a3223bfda3721db78dd74dbb70cd4ce4bee8 Mon Sep 17 00:00:00 2001 From: Andrew Leung Date: Fri, 25 Apr 2014 14:23:45 -0700 Subject: [PATCH] Rearrange add_user args to maintain compatibility --- lib/sis/csv/user_importer.rb | 2 +- lib/sis/user_importer.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/sis/csv/user_importer.rb b/lib/sis/csv/user_importer.rb index 19bb316f324..f8ba6d5b049 100644 --- a/lib/sis/csv/user_importer.rb +++ b/lib/sis/csv/user_importer.rb @@ -33,7 +33,7 @@ module SIS update_progress begin - importer.add_user(row['user_id'], row['login_id'], row['status'], row['first_name'], row['last_name'], row['short_name'], row['email'], row['password'], row['ssha_password']) + importer.add_user(row['user_id'], row['login_id'], row['status'], row['first_name'], row['last_name'], row['email'], row['password'], row['ssha_password'], nil, row['short_name']) rescue ImportError => e messages << "#{e}" end diff --git a/lib/sis/user_importer.rb b/lib/sis/user_importer.rb index 2bb8ccbdfb2..d0b38a07690 100644 --- a/lib/sis/user_importer.rb +++ b/lib/sis/user_importer.rb @@ -62,14 +62,14 @@ module SIS @users_to_update_account_associations = [] end - def add_user(user_id, login_id, status, first_name, last_name, short_name=nil, email=nil, password=nil, ssha_password=nil, integration_id=nil) - @logger.debug("Processing User #{[user_id, login_id, status, first_name, last_name, short_name, email, password, ssha_password, integration_id].inspect}") + def add_user(user_id, login_id, status, first_name, last_name, email=nil, password=nil, ssha_password=nil, integration_id=nil, short_name=nil) + @logger.debug("Processing User #{[user_id, login_id, status, first_name, last_name, email, password, ssha_password, integration_id, short_name].inspect}") raise ImportError, "No user_id given for a user" if user_id.blank? raise ImportError, "No login_id given for user #{user_id}" if login_id.blank? raise ImportError, "Improper status for user #{user_id}" unless status =~ /\A(active|deleted)/i - @batched_users << [user_id.to_s, login_id, status, first_name, last_name, short_name, email, password, ssha_password, integration_id] + @batched_users << [user_id.to_s, login_id, status, first_name, last_name, email, password, ssha_password, integration_id, short_name] process_batch if @batched_users.size >= @updates_every end @@ -86,7 +86,7 @@ module SIS while !@batched_users.empty? && tx_end_time > Time.now user_row = @batched_users.shift @logger.debug("Processing User #{user_row.inspect}") - user_id, login_id, status, first_name, last_name, short_name, email, password, ssha_password, integration_id = user_row + user_id, login_id, status, first_name, last_name, email, password, ssha_password, integration_id, short_name = user_row pseudo = @root_account.pseudonyms.find_by_sis_user_id(user_id.to_s) pseudo_by_login = @root_account.pseudonyms.active.by_unique_id(login_id).first