cafe-grader-web Commit - r289:bafc73878f35

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r289:bafc73878f35 - Thu, 11 Mar 2010 08:47:56 - 2 files changed: 9 inserted, 3 deleted

app/controllers/user_admin_controller.rb ¶ +3

                   redirect_to :action => 'list'
                 end
                 def remove_from_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests.delete(contest)
                   end
                   redirect_to :action => 'list'
                 end
                 def contest_management
                 end
                 def manage_contest
                   contest = Contest.find(params[:contest][:id])
                   if !contest
                     flash[:notice] = 'You did not choose the contest.'
                     redirect_to :action => 'contest_management' and return
                   end
                   operation = params[:operation]
                   if not ['add','remove','assign'].include? operation
                     flash[:notice] = 'You did not choose the operation to perform.'
                     redirect_to :action => 'contest_management' and return
                   end
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'contest_management' and return
                   end
                   note = []
                   lines.split("\n").each do |line|
                     puts line
                     user = User.find_by_login(line.chomp)
                     puts user
                     if user
                       if operation=='add'
                         user.contests << contest
                       elsif operation=='remove'
                         user.contests.delete(contest)
                       else
                         user.contests = [contest]
                       end
+            +
+            +         user.contest_stat.destroy if params[:reset_timer]
+            +
                       note << user.login
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 # admin management
                 def admin
                   @admins = User.find(:all).find_all {|user| user.admin? }
                 end
                 def grant_admin
                   login = params[:login]
                   user = User.find_by_login(login)
                   if user!=nil
                     admin_role = Role.find_by_name('admin')
                     user.roles << admin_role
                   else
                     flash[:notice] = 'Unknown user'
                   end
                   flash[:notice] = 'User added as admins'
                   redirect_to :action => 'admin'
                 end
                 def revoke_admin
                   user = User.find(params[:id])
                   if user==nil
                     flash[:notice] = 'Unknown user'
                     redirect_to :action => 'admin' and return
                   elsif user.login == 'root'
                     flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
                     redirect_to :action => 'admin' and return
                   end
                   admin_role = Role.find_by_name('admin')
                   user.roles.delete(admin_role)
                   flash[:notice] = 'User permission revoked'
                   redirect_to :action => 'admin'
                 end
                 protected
                 def random_password(length=5)
                   chars = 'abcdefghijkmnopqrstuvwxyz23456789'
                   newpass = ""

app/views/user_admin/contest_management.html.haml ¶ +6 -3

               %h1 Bulk edit users in contests
               - 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]})
-            -   &nbsp;&nbsp;&nbsp;&nbsp;
+            +   = check_box_tag 'reset_timer'
-            -   = submit_tag "Perform action", :confirm => 'Are you sure?'
+            +   Auto-reset current contest timer.
+            +   %br/
+            +
+            +   = submit_tag "Perform action!", :confirm => 'Are you sure?'
               %hr/
               = link_to '[go back to index]', :action => 'index'

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r289:bafc73878f35 - Thu, 11 Mar 2010 08:47:56 - 2 files changed: 9 inserted, 3 deleted

Sign in to your account

Commit r289:bafc73878f35 public

Author

r289:bafc73878f35 - Thu, 11 Mar 2010 08:47:56 - 2 files changed: 9 inserted, 3 deleted

Commit `r289:bafc73878f35` public