ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rearrange add_user args to maintain compatibility

This commit is contained in:
Andrew Leung 2014-04-25 14:23:45 -07:00
parent 7c229153b0
commit d495a3223b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sis/csv/user_importer.rb
View File

@ -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

8
lib/sis/user_importer.rb
View File

@ -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