cafe-grader-web

Commit r483:7cf62e1e74ba public

parent | child
Description:
confusing merge
Commit status:
[Not Reviewed]
References:
merge 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

r483:7cf62e1e74ba - - 1 file changed: 0 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,29 +1,28
1 1 require 'csv'
2 2
3 3 class UserAdminController < ApplicationController
4 4
5 -
6 5 include MailHelperMethods
7 6
8 7 before_filter :admin_authorization
9 8
10 9 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
11 10 verify :method => :post, :only => [ :destroy,
12 11 :create, :create_from_list,
13 12 :update,
14 13 :manage_contest,
15 14 :bulk_mail
16 15 ],
17 16 :redirect_to => { :action => :list }
18 17
19 18 def index
20 19 list
21 20 render :action => 'list'
22 21 end
23 22
24 23 def list
25 24 @user_count = User.count
26 25 if params[:page] == 'all'
27 26 @users = User.all
28 27 @paginated = false
29 28 else
You need to be logged in to leave comments. Login now