cafe-grader-web

Commit r307:2cdefa1ab6f2 public

parent | child
Description:
fixed new users import bug when passwords contain extra spaces at the end
Commit status:
[Not Reviewed]
References:
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

r307:2cdefa1ab6f2 - - 1 file changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,169 +1,169
1 class UserAdminController < ApplicationController
1 class UserAdminController < ApplicationController
2
2
3 include MailHelperMethods
3 include MailHelperMethods
4
4
5 before_filter :admin_authorization
5 before_filter :admin_authorization
6
6
7 def index
7 def index
8 list
8 list
9 render :action => 'list'
9 render :action => 'list'
10 end
10 end
11
11
12 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
12 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
13 verify :method => :post, :only => [ :destroy,
13 verify :method => :post, :only => [ :destroy,
14 :create, :create_from_list,
14 :create, :create_from_list,
15 :update ],
15 :update ],
16 :redirect_to => { :action => :list }
16 :redirect_to => { :action => :list }
17
17
18 def list
18 def list
19 @user_count = User.count
19 @user_count = User.count
20 if params[:page] == 'all'
20 if params[:page] == 'all'
21 @users = User.all
21 @users = User.all
22 @paginated = false
22 @paginated = false
23 else
23 else
24 @users = User.paginate :page => params[:page]
24 @users = User.paginate :page => params[:page]
25 @paginated = true
25 @paginated = true
26 end
26 end
27 @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
27 @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
28 @contests = Contest.enabled
28 @contests = Contest.enabled
29 end
29 end
30
30
31 def active
31 def active
32 sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
32 sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
33 @users = []
33 @users = []
34 sessions.each do |session|
34 sessions.each do |session|
35 if session.data[:user_id]
35 if session.data[:user_id]
36 @users << User.find(session.data[:user_id])
36 @users << User.find(session.data[:user_id])
37 end
37 end
38 end
38 end
39 end
39 end
40
40
41 def show
41 def show
42 @user = User.find(params[:id])
42 @user = User.find(params[:id])
43 end
43 end
44
44
45 def new
45 def new
46 @user = User.new
46 @user = User.new
47 end
47 end
48
48
49 def create
49 def create
50 @user = User.new(params[:user])
50 @user = User.new(params[:user])
51 @user.activated = true
51 @user.activated = true
52 if @user.save
52 if @user.save
53 flash[:notice] = 'User was successfully created.'
53 flash[:notice] = 'User was successfully created.'
54 redirect_to :action => 'list'
54 redirect_to :action => 'list'
55 else
55 else
56 render :action => 'new'
56 render :action => 'new'
57 end
57 end
58 end
58 end
59
59
60 def create_from_list
60 def create_from_list
61 lines = params[:user_list]
61 lines = params[:user_list]
62
62
63 note = []
63 note = []
64
64
65 lines.split("\n").each do |line|
65 lines.split("\n").each do |line|
66 items = line.chomp.split(',')
66 items = line.chomp.split(',')
67 if items.length>=2
67 if items.length>=2
68 login = items[0]
68 login = items[0]
69 full_name = items[1]
69 full_name = items[1]
70
70
71 added_random_password = false
71 added_random_password = false
72 if items.length>=3
72 if items.length>=3
73 - password = items[2]
73 + password = items[2].chomp(" ")
74 user_alias = (items.length>=4) ? items[3] : login
74 user_alias = (items.length>=4) ? items[3] : login
75 else
75 else
76 password = random_password
76 password = random_password
77 user_alias = (items.length>=4) ? items[3] : login
77 user_alias = (items.length>=4) ? items[3] : login
78 added_random_password = true
78 added_random_password = true
79 end
79 end
80
80
81 user = User.new({:login => login,
81 user = User.new({:login => login,
82 :full_name => full_name,
82 :full_name => full_name,
83 :password => password,
83 :password => password,
84 :password_confirmation => password,
84 :password_confirmation => password,
85 :alias => user_alias})
85 :alias => user_alias})
86 user.activated = true
86 user.activated = true
87 user.save
87 user.save
88
88
89 if added_random_password
89 if added_random_password
90 note << "'#{login}' (+)"
90 note << "'#{login}' (+)"
91 else
91 else
92 note << login
92 note << login
93 end
93 end
94 end
94 end
95 end
95 end
96 flash[:notice] = 'User(s) ' + note.join(', ') +
96 flash[:notice] = 'User(s) ' + note.join(', ') +
97 ' were successfully created. ' +
97 ' were successfully created. ' +
98 '( (+) - created with random passwords.)'
98 '( (+) - created with random passwords.)'
99 redirect_to :action => 'list'
99 redirect_to :action => 'list'
100 end
100 end
101
101
102 def edit
102 def edit
103 @user = User.find(params[:id])
103 @user = User.find(params[:id])
104 end
104 end
105
105
106 def update
106 def update
107 @user = User.find(params[:id])
107 @user = User.find(params[:id])
108 if @user.update_attributes(params[:user])
108 if @user.update_attributes(params[:user])
109 flash[:notice] = 'User was successfully updated.'
109 flash[:notice] = 'User was successfully updated.'
110 redirect_to :action => 'show', :id => @user
110 redirect_to :action => 'show', :id => @user
111 else
111 else
112 render :action => 'edit'
112 render :action => 'edit'
113 end
113 end
114 end
114 end
115
115
116 def destroy
116 def destroy
117 User.find(params[:id]).destroy
117 User.find(params[:id]).destroy
118 redirect_to :action => 'list'
118 redirect_to :action => 'list'
119 end
119 end
120
120
121 def user_stat
121 def user_stat
122 @problems = Problem.find_available_problems
122 @problems = Problem.find_available_problems
123 @users = User.find(:all, :include => [:contests, :contest_stat])
123 @users = User.find(:all, :include => [:contests, :contest_stat])
124 @scorearray = Array.new
124 @scorearray = Array.new
125 @users.each do |u|
125 @users.each do |u|
126 ustat = Array.new
126 ustat = Array.new
127 ustat[0] = u
127 ustat[0] = u
128 @problems.each do |p|
128 @problems.each do |p|
129 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
129 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
130 if (sub!=nil) and (sub.points!=nil)
130 if (sub!=nil) and (sub.points!=nil)
131 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
131 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
132 else
132 else
133 ustat << [0,false]
133 ustat << [0,false]
134 end
134 end
135 end
135 end
136 @scorearray << ustat
136 @scorearray << ustat
137 end
137 end
138 end
138 end
139
139
140 def import
140 def import
141 if params[:file]==''
141 if params[:file]==''
142 flash[:notice] = 'Error importing no file'
142 flash[:notice] = 'Error importing no file'
143 redirect_to :action => 'list' and return
143 redirect_to :action => 'list' and return
144 end
144 end
145 import_from_file(params[:file])
145 import_from_file(params[:file])
146 end
146 end
147
147
148 def random_all_passwords
148 def random_all_passwords
149 users = User.find(:all)
149 users = User.find(:all)
150 @prefix = params[:prefix] || ''
150 @prefix = params[:prefix] || ''
151 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
151 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
152 @changed = false
152 @changed = false
153 if request.request_method == :post
153 if request.request_method == :post
154 @non_admin_users.each do |user|
154 @non_admin_users.each do |user|
155 password = random_password
155 password = random_password
156 user.password = password
156 user.password = password
157 user.password_confirmation = password
157 user.password_confirmation = password
158 user.save
158 user.save
159 end
159 end
160 @changed = true
160 @changed = true
161 end
161 end
162 end
162 end
163
163
164 # contest management
164 # contest management
165
165
166 def contests
166 def contests
167 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
167 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
168 @contests = Contest.enabled
168 @contests = Contest.enabled
169 end
169 end
You need to be logged in to leave comments. Login now