cafe-grader-web

Commit r571:f8d309d2e37e public

parent | child
Description:
- bootstrap: user admin quick add
Commit status:
[Not Reviewed]
References:
bootstrap
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

r571:f8d309d2e37e - - 2 files changed: 30 inserted, 29 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -46,35 +46,35
46 46 @user = User.find(params[:id])
47 47 end
48 48
49 49 def new
50 50 @user = User.new
51 51 end
52 52
53 53 def create
54 54 @user = User.new(params[:user])
55 55 @user.activated = true
56 56 if @user.save
57 57 flash[:notice] = 'User was successfully created.'
58 - redirect_to :action => 'list'
58 + redirect_to :action => 'index'
59 59 else
60 60 render :action => 'new'
61 61 end
62 62 end
63 63
64 64 def clear_last_ip
65 65 @user = User.find(params[:id])
66 66 @user.last_ip = nil
67 67 @user.save
68 - redirect_to action: 'list', page: params[:page]
68 + redirect_to action: 'index', page: params[:page]
69 69 end
70 70
71 71 def create_from_list
72 72 lines = params[:user_list]
73 73
74 74 note = []
75 75
76 76 lines.split("\n").each do |line|
77 77 items = line.chomp.split(',')
78 78 if items.length>=2
79 79 login = items[0]
80 80 full_name = items[1]
@@ -104,44 +104,44
104 104 user.save
105 105
106 106 if added_random_password
107 107 note << "'#{login}' (+)"
108 108 else
109 109 note << login
110 110 end
111 111 end
112 112 end
113 113 flash[:notice] = 'User(s) ' + note.join(', ') +
114 114 ' were successfully created. ' +
115 115 '( (+) - created with random passwords.)'
116 - redirect_to :action => 'list'
116 + redirect_to :action => 'index'
117 117 end
118 118
119 119 def edit
120 120 @user = User.find(params[:id])
121 121 end
122 122
123 123 def update
124 124 @user = User.find(params[:id])
125 125 if @user.update_attributes(params[:user])
126 126 flash[:notice] = 'User was successfully updated.'
127 127 redirect_to :action => 'show', :id => @user
128 128 else
129 129 render :action => 'edit'
130 130 end
131 131 end
132 132
133 133 def destroy
134 134 User.find(params[:id]).destroy
135 - redirect_to :action => 'list'
135 + redirect_to :action => 'index'
136 136 end
137 137
138 138 def user_stat
139 139 if params[:commit] == 'download csv'
140 140 @problems = Problem.all
141 141 else
142 142 @problems = Problem.find_available_problems
143 143 end
144 144 @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
145 145 @scorearray = Array.new
146 146 @users.each do |u|
147 147 ustat = Array.new
@@ -190,25 +190,25
190 190
191 191 if params[:commit] == 'download csv' then
192 192 csv = gen_csv_from_scorearray(@scorearray,@problems)
193 193 send_data csv, filename: 'max_score.csv'
194 194 else
195 195 render template: 'user_admin/user_stat'
196 196 end
197 197 end
198 198
199 199 def import
200 200 if params[:file]==''
201 201 flash[:notice] = 'Error importing no file'
202 - redirect_to :action => 'list' and return
202 + redirect_to :action => 'index' and return
203 203 end
204 204 import_from_file(params[:file])
205 205 end
206 206
207 207 def random_all_passwords
208 208 users = User.find(:all)
209 209 @prefix = params[:prefix] || ''
210 210 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
211 211 @changed = false
212 212 if request.request_method == 'POST'
213 213 @non_admin_users.each do |user|
214 214 password = random_password
@@ -243,34 +243,34
243 243 end
244 244 flash[:notice] = 'User(s) ' + note.join(', ') +
245 245 " were successfully reassigned to #{contest.title}."
246 246 redirect_to :action => 'contests', :id =>contest.id
247 247 end
248 248
249 249 def add_to_contest
250 250 user = User.find(params[:id])
251 251 contest = Contest.find(params[:contest_id])
252 252 if user and contest
253 253 user.contests << contest
254 254 end
255 - redirect_to :action => 'list'
255 + redirect_to :action => 'index'
256 256 end
257 257
258 258 def remove_from_contest
259 259 user = User.find(params[:id])
260 260 contest = Contest.find(params[:contest_id])
261 261 if user and contest
262 262 user.contests.delete(contest)
263 263 end
264 - redirect_to :action => 'list'
264 + redirect_to :action => 'index'
265 265 end
266 266
267 267 def contest_management
268 268 end
269 269
270 270 def manage_contest
271 271 contest = Contest.find(params[:contest][:id])
272 272 if !contest
273 273 flash[:notice] = 'You did not choose the contest.'
274 274 redirect_to :action => 'contest_management' and return
275 275 end
276 276
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,36 +1,37
1 1 %h1 Listing users
2 +
3 + .panel.panel-primary
4 + .panel-title.panel-heading
5 + Quick Add
6 + .panel-body
7 + = form_tag( {method: 'post'}, {class: 'form-inline'}) do
8 + .form-group
9 + = label_tag 'user_login', 'Login'
10 + = text_field 'user', 'login', :size => 10,class: 'form-control'
11 + .form-group
12 + = label_tag 'user_full_name', 'Full Name'
13 + = text_field 'user', 'full_name', :size => 10,class: 'form-control'
14 + .form-group
15 + = label_tag 'user_password', 'Password'
16 + = text_field 'user', 'password', :size => 10,class: 'form-control'
17 + .form-group
18 + = label_tag 'user_password_confirmation', 'Confirm'
19 + = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
20 + .form-group
21 + = label_tag 'user_email', 'email'
22 + = text_field 'user', 'email', :size => 10,class: 'form-control'
23 + =submit_tag "Create", class: 'btn btn-primary'
24 +
2 25 .submitbox
3 - %b Quick add
4 - = form_tag :action => 'create' do
5 - %table{:border => "0"}
6 - %tr
7 - %td
8 - %label{:for => "user_login"} Login
9 - %td
10 - %label{:for => "user_full_name"} Full name
11 - %td
12 - %label{:for => "user_password"} Password
13 - %td
14 - %label{:for => "user_password_confirmation"} Confirm
15 - %td
16 - %label{:for => "user_email"} Email
17 - %tr
18 - %td= text_field 'user', 'login', :size => 10
19 - %td= text_field 'user', 'full_name', :size => 30
20 - %td= password_field 'user', 'password', :size => 10
21 - %td= password_field 'user', 'password_confirmation', :size => 10
22 - %td= email_field 'user', 'email', :size => 15
23 - %td= submit_tag "Create"
24 - %br/
25 26 %b Import from site management
26 27 = form_tag({:action => 'import'}, :multipart => true) do
27 28 File: #{file_field_tag 'file'} #{submit_tag 'Import'}
28 29 %br/
29 30 %b What else:
30 31 = link_to 'New user', {:action => 'new'}, { class: 'btn btn-default btn-sm'}
31 32 = link_to 'New list of users',{ :action => 'new_list'}, { class: 'btn btn-default btn-sm'}
32 33 = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default btn-sm'}
33 34 = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default btn-sm'}
34 35 = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default btn-sm'}
35 36 = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default btn-sm'}
36 37 - if GraderConfiguration.multicontests?
You need to be logged in to leave comments. Login now