diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb --- a/app/controllers/user_admin_controller.rb +++ b/app/controllers/user_admin_controller.rb @@ -13,6 +13,7 @@ def list @users = User.find(:all) + @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at'] end def show @@ -77,8 +78,7 @@ @scorearray = Array.new @users.each do |u| ustat = Array.new - ustat[0] = u.login - ustat[1] = u.full_name + ustat[0] = u @problems.each do |p| sub = Submission.find_last_by_user_and_problem(u.id,p.id) if (sub!=nil) and (sub.points!=nil) @@ -152,7 +152,12 @@ u.password = user[:password] u.country = countries[user[:country_id]] u.site = sites[user[:site_id]] - u.save + u.activated = true + u.email = "empty-#{u.login}@none.com" + if not u.save + @import_log << "Errors\n" + u.errors.each { |attr,msg| @import_log << "#{attr} - #{msg}\n" } + end end end