cafe-grader-web

Commit r307:2cdefa1ab6f2 public

parent | child
Description:
fixed new users import bug when passwords contain extra spaces at the end
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r307:2cdefa1ab6f2 - - 1 file changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -49,49 +49,49
49 49 def create
50 50 @user = User.new(params[:user])
51 51 @user.activated = true
52 52 if @user.save
53 53 flash[:notice] = 'User was successfully created.'
54 54 redirect_to :action => 'list'
55 55 else
56 56 render :action => 'new'
57 57 end
58 58 end
59 59
60 60 def create_from_list
61 61 lines = params[:user_list]
62 62
63 63 note = []
64 64
65 65 lines.split("\n").each do |line|
66 66 items = line.chomp.split(',')
67 67 if items.length>=2
68 68 login = items[0]
69 69 full_name = items[1]
70 70
71 71 added_random_password = false
72 72 if items.length>=3
73 - password = items[2]
73 + password = items[2].chomp(" ")
74 74 user_alias = (items.length>=4) ? items[3] : login
75 75 else
76 76 password = random_password
77 77 user_alias = (items.length>=4) ? items[3] : login
78 78 added_random_password = true
79 79 end
80 80
81 81 user = User.new({:login => login,
82 82 :full_name => full_name,
83 83 :password => password,
84 84 :password_confirmation => password,
85 85 :alias => user_alias})
86 86 user.activated = true
87 87 user.save
88 88
89 89 if added_random_password
90 90 note << "'#{login}' (+)"
91 91 else
92 92 note << login
93 93 end
94 94 end
95 95 end
96 96 flash[:notice] = 'User(s) ' + note.join(', ') +
97 97 ' were successfully created. ' +
You need to be logged in to leave comments. Login now