cafe-grader-web

Commit r469:b28cd479ede6 public

parent | child
Description:
modify user list creation into user list update
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r469:b28cd479ede6 - - 1 file changed: 11 inserted, 5 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -81,17 +81,23
81 else
81 else
82 password = random_password
82 password = random_password
83 user_alias = (items.length>=4) ? items[3] : login
83 user_alias = (items.length>=4) ? items[3] : login
84 added_random_password = true
84 added_random_password = true
85 end
85 end
86
86
87 - user = User.new({:login => login,
87 + user = User.find_by_login(login)
88 - :full_name => full_name,
88 + if (user)
89 - :password => password,
89 + user.full_name = full_name
90 - :password_confirmation => password,
90 + user.password = password
91 - :alias => user_alias})
91 + else
92 + user = User.new({:login => login,
93 + :full_name => full_name,
94 + :password => password,
95 + :password_confirmation => password,
96 + :alias => user_alias})
97 + end
92 user.activated = true
98 user.activated = true
93 user.save
99 user.save
94
100
95 if added_random_password
101 if added_random_password
96 note << "'#{login}' (+)"
102 note << "'#{login}' (+)"
97 else
103 else
You need to be logged in to leave comments. Login now