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
@@ -39,101 +39,107
39 39 @users = []
40 40 sessions.each do |session|
41 41 if session.data[:user_id]
42 42 @users << User.find(session.data[:user_id])
43 43 end
44 44 end
45 45 end
46 46
47 47 def show
48 48 @user = User.find(params[:id])
49 49 end
50 50
51 51 def new
52 52 @user = User.new
53 53 end
54 54
55 55 def create
56 56 @user = User.new(params[:user])
57 57 @user.activated = true
58 58 if @user.save
59 59 flash[:notice] = 'User was successfully created.'
60 60 redirect_to :action => 'list'
61 61 else
62 62 render :action => 'new'
63 63 end
64 64 end
65 65
66 66 def create_from_list
67 67 lines = params[:user_list]
68 68
69 69 note = []
70 70
71 71 lines.split("\n").each do |line|
72 72 items = line.chomp.split(',')
73 73 if items.length>=2
74 74 login = items[0]
75 75 full_name = items[1]
76 76
77 77 added_random_password = false
78 78 if items.length>=3
79 79 password = items[2].chomp(" ")
80 80 user_alias = (items.length>=4) ? items[3] : login
81 81 else
82 82 password = random_password
83 83 user_alias = (items.length>=4) ? items[3] : login
84 84 added_random_password = true
85 85 end
86 86
87 - user = User.new({:login => login,
88 - :full_name => full_name,
89 - :password => password,
90 - :password_confirmation => password,
91 - :alias => user_alias})
87 + user = User.find_by_login(login)
88 + if (user)
89 + user.full_name = full_name
90 + user.password = password
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 98 user.activated = true
93 99 user.save
94 100
95 101 if added_random_password
96 102 note << "'#{login}' (+)"
97 103 else
98 104 note << login
99 105 end
100 106 end
101 107 end
102 108 flash[:notice] = 'User(s) ' + note.join(', ') +
103 109 ' were successfully created. ' +
104 110 '( (+) - created with random passwords.)'
105 111 redirect_to :action => 'list'
106 112 end
107 113
108 114 def edit
109 115 @user = User.find(params[:id])
110 116 end
111 117
112 118 def update
113 119 @user = User.find(params[:id])
114 120 if @user.update_attributes(params[:user])
115 121 flash[:notice] = 'User was successfully updated.'
116 122 redirect_to :action => 'show', :id => @user
117 123 else
118 124 render :action => 'edit'
119 125 end
120 126 end
121 127
122 128 def destroy
123 129 User.find(params[:id]).destroy
124 130 redirect_to :action => 'list'
125 131 end
126 132
127 133 def user_stat
128 134 if params[:commit] == 'download csv'
129 135 @problems = Problem.all
130 136 else
131 137 @problems = Problem.find_available_problems
132 138 end
133 139 @users = User.find(:all, :include => [:contests, :contest_stat])
134 140 @scorearray = Array.new
135 141 @users.each do |u|
136 142 ustat = Array.new
137 143 ustat[0] = u
138 144 @problems.each do |p|
139 145 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
You need to be logged in to leave comments. Login now