# HG changeset patch # User Jittat Fakcharoenphol # Date 2010-03-11 08:47:56 # Node ID bafc73878f356e2598bb3c912e3628078a61afb1 # Parent 74436ad04ad0bc2d7d1078a72a64c345d6ed840b resets contest start time when changing users' contest 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 @@ -208,6 +208,9 @@ else user.contests = [contest] end + + user.contest_stat.destroy if params[:reset_timer] + note << user.login end end diff --git a/app/views/user_admin/contest_management.html.haml b/app/views/user_admin/contest_management.html.haml --- a/app/views/user_admin/contest_management.html.haml +++ b/app/views/user_admin/contest_management.html.haml @@ -3,14 +3,17 @@ - form_tag :action => 'manage_contest' do List users' login below; one per line. %br/ - = text_area_tag 'login_list', nil, :rows => 25, :cols => 80 + = text_area_tag 'login_list', nil, :rows => 23, :cols => 80 %br/ You want to = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']]) contest = select("contest","id",Contest.all.collect {|c| [c.title, c.id]}) -      - = submit_tag "Perform action", :confirm => 'Are you sure?' + = check_box_tag 'reset_timer' + Auto-reset current contest timer. + %br/ + + = submit_tag "Perform action!", :confirm => 'Are you sure?' %hr/ = link_to '[go back to index]', :action => 'index'