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

@@ -13,12 +13,13
13	:update ],	13	:update ],
14	:redirect_to => { :action => :list }	14	:redirect_to => { :action => :list }
15		15
16	def list	16	def list
17	@users = User.find(:all)	17	@users = User.find(:all)
18	@hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']	18	@hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
		19	+ @contests = Contest.all(:conditions => {:enabled => true})
19	end	20	end
20		21
21	def active	22	def active
22	sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])	23	sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
23	@users = []	24	@users = []
24	sessions.each do \|session\|	25	sessions.each do \|session\|
@@ -147,12 +148,74
147	user.password_confirmation = password	148	user.password_confirmation = password
148	user.save	149	user.save
149	end	150	end
150	@changed = true	151	@changed = true
151	end	152	end
152	end	153	end
		154	+
		155	+ # contest management
		156	+
		157	+ def add_to_contest
		158	+ user = User.find(params[:id])
		159	+ contest = Contest.find(params[:contest_id])
		160	+ if user and contest
		161	+ user.contests << contest
		162	+ end
		163	+ redirect_to :action => 'list'
		164	+ end
		165	+
		166	+ def remove_from_contest
		167	+ user = User.find(params[:id])
		168	+ contest = Contest.find(params[:contest_id])
		169	+ if user and contest
		170	+ user.contests.delete(contest)
		171	+ end
		172	+ redirect_to :action => 'list'
		173	+ end
		174	+
		175	+ def contest_management
		176	+ end
		177	+
		178	+ def manage_contest
		179	+ contest = Contest.find(params[:contest][:id])
		180	+ if !contest
		181	+ flash[:notice] = 'You did not choose the contest.'
		182	+ redirect_to :action => 'contest_management' and return
		183	+ end
		184	+
		185	+ operation = params[:operation]
		186	+
		187	+ if operation!='add' and operation!='remove'
		188	+ flash[:notice] = 'You did not choose the operation to perform.'
		189	+ redirect_to :action => 'contest_management' and return
		190	+ end
		191	+
		192	+ lines = params[:login_list]
		193	+ if !lines or lines.blank?
		194	+ flash[:notice] = 'You entered an empty list.'
		195	+ redirect_to :action => 'contest_management' and return
		196	+ end
		197	+
		198	+ note = []
		199	+ lines.split("\n").each do \|line\|
		200	+ puts line
		201	+ user = User.find_by_login(line.chomp)
		202	+ puts user
		203	+ if user
		204	+ if operation=='add'
		205	+ user.contests << contest
		206	+ else
		207	+ user.contests.delete(contest)
		208	+ end
		209	+ note << user.login
		210	+ end
		211	+ end
		212	+ flash[:notice] = 'User(s) ' + note.join(', ') +
		213	+ ' were successfully modified. '
		214	+ redirect_to :action => 'contest_management'
		215	+ end
153		216
154	# admin management	217	# admin management
155		218
156	def admin	219	def admin
157	@admins = User.find(:all).find_all {\|user\| user.admin? }	220	@admins = User.find(:all).find_all {\|user\| user.admin? }
158	end	221	end

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

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

                 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]+$/

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

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

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

               %h1 Administrators
-            - %table
+            + %table{:class => 'info'}
-            -   %tr
+            +   %tr{:class => 'info-head'}
                   %th #
                   %th Login
                   %th Full name
                   %th
                 - @admins.each_with_index do |user, i|
                   %tr

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

@@ -30,33 +30,57
30	<b>What else: </b>	30	<b>What else: </b>
31	<%= link_to '[New user]', :action => 'new' %>	31	<%= link_to '[New user]', :action => 'new' %>
32	<%= link_to '[New list of users]', :action => 'new_list' %>	32	<%= link_to '[New list of users]', :action => 'new_list' %>
33	<%= link_to '[View administrators]', :action => 'admin' %>	33	<%= link_to '[View administrators]', :action => 'admin' %>
34	<%= link_to '[Random passwords]', :action => 'random_all_passwords' %>	34	<%= link_to '[Random passwords]', :action => 'random_all_passwords' %>
35	<%= link_to '[View active users]', :action => 'active' %>	35	<%= link_to '[View active users]', :action => 'active' %>
		36	+ <% if Configuration.multicontests? %>
		37	+ <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
		38	+ <% end %>
36	</div>	39	</div>
37		40
38	- <table>	41	+ <table class="info">
39	- <tr>	42	+ <tr class="info-head">
40	- <% for column in User.content_columns %>	43	+ <% for column in User.content_columns %>
41	- <% if !@hidden_columns.index(column.name) %>	44	+ <% if !@hidden_columns.index(column.name) %>
42	- <th><%= column.human_name %></th>	45	+ <th><%= column.human_name %></th>
		46	+ <% end %>
43	<% end %>	47	<% end %>
44	- <% end %>	48	+ <th></th>
		49	+ <th></th>
		50	+ <th></th>
		51	+ <% if Configuration.multicontests? %>
		52	+ <th>Contests</th>
		53	+ <th>Other enabled contests</th>
		54	+ <% end %>
45	</tr>	55	</tr>
46		56
47	<% for user in @users %>	57	<% for user in @users %>
48	- <tr>	58	+ <tr class="info-<%= cycle("odd","even") %>">
49	- <% for column in User.content_columns %>	59	+ <% for column in User.content_columns %>
50	- <% if !@hidden_columns.index(column.name) %>	60	+ <% if !@hidden_columns.index(column.name) %>
51	- <td><%=h user.send(column.name) %></td>	61	+ <td><%=h user.send(column.name) %></td>
		62	+ <% end %>
52	<% end %>	63	<% end %>
53	- <% end %>
54	<td><%= link_to 'Show', :action => 'show', :id => user %></td>	64	<td><%= link_to 'Show', :action => 'show', :id => user %></td>
55	<td><%= link_to 'Edit', :action => 'edit', :id => user %></td>	65	<td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
56	<td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>	66	<td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
		67	+ <% if Configuration.multicontests? %>
		68	+ <td>
		69	+ <% user.contests.each do \|contest\| %>
		70	+ <%= contest.name %> [<%= link_to 'x', :action => 'remove_from_contest', :id => user.id, :contest_id => contest.id %>]
		71	+ <% end %>
		72	+ </td>
		73	+ <td>
		74	+ <% @contests.each do \|contest\| %>
		75	+ <% if not user.contests.all.find {\|c\| c.id==contest.id } %>
		76	+ <%= contest.name %> [<%= link_to '+', :action => 'add_to_contest', :id => user.id, :contest_id => contest.id %>]
		77	+ <% end %>
		78	+ <% end %>
		79	+ </td>
		80	+ <% end %>
57	</tr>	81	</tr>
58	<% end %>	82	<% end %>
59	</table>	83	</table>
60		84
61		85
62	<br />	86	<br />

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