cafe-grader-web

Commit r289:bafc73878f35 public

parent | child
Description:
resets contest start time when changing users' contest
Commit status:
[Not Reviewed]
References:
default
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

r289:bafc73878f35 - - 2 files changed: 9 inserted, 3 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -199,24 +199,27
199 lines.split("\n").each do |line|
199 lines.split("\n").each do |line|
200 puts line
200 puts line
201 user = User.find_by_login(line.chomp)
201 user = User.find_by_login(line.chomp)
202 puts user
202 puts user
203 if user
203 if user
204 if operation=='add'
204 if operation=='add'
205 user.contests << contest
205 user.contests << contest
206 elsif operation=='remove'
206 elsif operation=='remove'
207 user.contests.delete(contest)
207 user.contests.delete(contest)
208 else
208 else
209 user.contests = [contest]
209 user.contests = [contest]
210 end
210 end
211 +
212 + user.contest_stat.destroy if params[:reset_timer]
213 +
211 note << user.login
214 note << user.login
212 end
215 end
213 end
216 end
214 flash[:notice] = 'User(s) ' + note.join(', ') +
217 flash[:notice] = 'User(s) ' + note.join(', ') +
215 ' were successfully modified. '
218 ' were successfully modified. '
216 redirect_to :action => 'contest_management'
219 redirect_to :action => 'contest_management'
217 end
220 end
218
221
219 # admin management
222 # admin management
220
223
221 def admin
224 def admin
222 @admins = User.find(:all).find_all {|user| user.admin? }
225 @admins = User.find(:all).find_all {|user| user.admin? }
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,16 +1,19
1 %h1 Bulk edit users in contests
1 %h1 Bulk edit users in contests
2
2
3 - form_tag :action => 'manage_contest' do
3 - form_tag :action => 'manage_contest' do
4 List users' login below; one per line.
4 List users' login below; one per line.
5 %br/
5 %br/
6 - = text_area_tag 'login_list', nil, :rows => 25, :cols => 80
6 + = text_area_tag 'login_list', nil, :rows => 23, :cols => 80
7 %br/
7 %br/
8 You want to
8 You want to
9 = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']])
9 = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']])
10 contest
10 contest
11 = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
11 = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
12 - &nbsp;&nbsp;&nbsp;&nbsp;
12 + = check_box_tag 'reset_timer'
13 - = submit_tag "Perform action", :confirm => 'Are you sure?'
13 + Auto-reset current contest timer.
14 + %br/
15 +
16 + = submit_tag "Perform action!", :confirm => 'Are you sure?'
14
17
15 %hr/
18 %hr/
16 = link_to '[go back to index]', :action => 'index'
19 = link_to '[go back to index]', :action => 'index'
You need to be logged in to leave comments. Login now