cafe-grader-web Commit - r280:f8e3b2e72e4a

cafe-grader-web

Commit `r280:f8e3b2e72e4a` public

parent | child

Description:

manages users in contests

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

r280:f8e3b2e72e4a - Wed, 03 Mar 2010 18:46:52 - 7 files changed: 128 inserted, 24 deleted

app/views/user_admin/contest_management.html.haml created 644 ¶ +16

			@@ -0,0 +1,16
		1	+ %h1 Bulk edit users in contests
		2	+
		3	+ - form_tag :action => 'manage_contest' do
		4	+ List users' login below; one per line.
		5	+ %br/
		6	+ = text_area_tag 'login_list', nil, :rows => 25, :cols => 80
		7	+ %br/
		8	+ You want to
		9	+ = select(nil,"operation",[['add users to','add'],['remove users from','remove']])
		10	+ contest
		11	+ = select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})
		12	+
		13	+ = submit_tag "Perform action", :confirm => 'Are you sure?'
		14	+
		15	+ %hr/
		16	+ = link_to '[go back to index]', :action => 'index'

app/controllers/user_admin_controller.rb ¶ +63

                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update ],
                        :redirect_to => { :action => :list }
                 def list
                   @users = User.find(:all)
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
+            +     @contests = Contest.all(:conditions => {:enabled => true})
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if request.request_method == :post
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
+            +
+            +   # contest management
+            +
+            +   def add_to_contest
+            +     user = User.find(params[:id])
+            +     contest = Contest.find(params[:contest_id])
+            +     if user and contest
+            +       user.contests << contest
+            +     end
+            +     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 operation!='add' and operation!='remove'
+            +       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
+            +         else
+            +           user.contests.delete(contest)
+            +         end
+            +         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')

app/models/problem.rb ¶ +1 -1

               class Problem < ActiveRecord::Base
                 belongs_to :description
-            -   has_and_belongs_to_many :contests
+            +   has_and_belongs_to_many :contests, :uniq => true
                 has_many :test_pairs, :dependent => :delete_all
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 named_scope :available, :conditions => {:available => true}
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems

app/models/user.rb ¶ +1 -1

                          :order => 'created_at DESC'
                 has_many :replied_messages,
                          :class_name => "Message",
                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
-            -   has_and_belongs_to_many :contests
+            +   has_and_belongs_to_many :contests, :uniq => true
                 named_scope :activated_users, :conditions => {:activated => true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?

app/views/main/list.html.haml ¶ +10 -9

               - if Configuration.show_tasks_to?(@user)
                 - if not Configuration.multicontests?
                   %table.info
                     %tr.info-head
                       %th
                       %th Tasks
                       %th # of sub(s)
                       %th Results
                     = render :partial => 'problem', :collection => @problems
                 - else
                   - @contest_problems.each do |cp|
-            -       %h2{:class =>'contest-title'}
-            -         = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
-            -       %table.info
-            -         %tr.info-head
-            -           %th
-            -           %th Tasks
-            -           %th # of sub(s)
-            -           %th Results
-            -         = render :partial => 'problem', :collection => cp[:problems]
+            +       - if cp[:problems].length > 0
+            +         %h2{:class =>'contest-title'}
+            +           = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
+            +         %table.info
+            +           %tr.info-head
+            +             %th
+            +             %th Tasks
+            +             %th # of sub(s)
+            +             %th Results
+            +           = render :partial => 'problem', :collection => cp[:problems]
               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();

app/views/user_admin/admin.html.haml ¶ +2 -2

               %h1 Administrators
-            - %table
-            -   %tr
+            + %table{:class => 'info'}
+            +   %tr{:class => 'info-head'}
                   %th #
                   %th Login
                   %th Full name
                   %th
                 - @admins.each_with_index do |user, i|
                   %tr
                     %td= i+1
                     %td= user.login
                     %td= user.full_name
                     %td
                       - if user.login!='root'
                         = link_to '[revoke]', :action => 'revoke_admin', :id => user.id

app/views/user_admin/list.rhtml ¶ +35 -11

                 <br/>
                 <b>Import from site management</b>
                 <% form_tag({:action => 'import'}, :multipart => true) do %>
                   File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
                 <% end %>
                 <br/>
                 <b>What else: </b>
                 <%= link_to '[New user]', :action => 'new' %>
                 <%= link_to '[New list of users]', :action => 'new_list' %>
                 <%= link_to '[View administrators]', :action => 'admin' %>
                 <%= link_to '[Random passwords]', :action => 'random_all_passwords' %>
                 <%= link_to '[View active users]', :action => 'active' %>
+            +   <% if Configuration.multicontests? %>
+            +     <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
+            +   <% end %>
               </div>
-            - <table>
-            -   <tr>
-            -   <% for column in User.content_columns %>
-            -     <% if !@hidden_columns.index(column.name) %>
-            -       <th><%= column.human_name %></th>
+            + <table class="info">
+            +   <tr class="info-head">
+            +     <% for column in User.content_columns %>
+            +       <% if !@hidden_columns.index(column.name) %>
+            +         <th><%= column.human_name %></th>
+            +       <% end %>
                   <% end %>
-            -   <% end %>
+            +     <th></th>
+            +     <th></th>
+            +     <th></th>
+            +     <% if Configuration.multicontests? %>
+            +       <th>Contests</th>
+            +       <th>Other enabled contests</th>
+            +     <% end %>
                 </tr>
               <% for user in @users %>
-            -   <tr>
-            -   <% for column in User.content_columns %>
-            -     <% if !@hidden_columns.index(column.name) %>
-            -       <td><%=h user.send(column.name) %></td>
+            +   <tr class="info-<%= cycle("odd","even") %>">
+            +     <% for column in User.content_columns %>
+            +       <% if !@hidden_columns.index(column.name) %>
+            +         <td><%=h user.send(column.name) %></td>
+            +       <% end %>
                   <% end %>
-            -   <% end %>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
+            +     <% if Configuration.multicontests? %>
+            +       <td>
+            +         <% user.contests.each do |contest| %>
+            + 	  <%= contest.name %> [<%= link_to 'x', :action => 'remove_from_contest', :id => user.id, :contest_id => contest.id %>]
+            +         <% end %>
+            +       </td>
+            +       <td>
+            + 	<% @contests.each do |contest| %>
+            + 	  <% if not user.contests.all.find {|c| c.id==contest.id } %>
+            +   	    <%= contest.name %> [<%= link_to '+', :action => 'add_to_contest', :id => user.id, :contest_id => contest.id %>]
+            +           <% end %>
+            + 	<% end %>
+            +       </td>
+            +     <% end %>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to 'New user', :action => 'new' %>
               <%= link_to 'New list of users', :action => 'new_list' %>

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

r280:f8e3b2e72e4a - Wed, 03 Mar 2010 18:46:52 - 7 files changed: 128 inserted, 24 deleted

Sign in to your account

Commit r280:f8e3b2e72e4a public

Author

r280:f8e3b2e72e4a - Wed, 03 Mar 2010 18:46:52 - 7 files changed: 128 inserted, 24 deleted

Commit `r280:f8e3b2e72e4a` public