cafe-grader-web

Commit r671:52ce712479a1 public

parent | child
Description:
add options for bulk manage add user to group (not finished)
Commit status:
[Not Reviewed]
References:
java
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

r671:52ce712479a1 - - 2 files changed: 17 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -219,24 +219,25
219 219 @changed = false
220 220 if request.request_method == 'POST'
221 221 @non_admin_users.each do |user|
222 222 password = random_password
223 223 user.password = password
224 224 user.password_confirmation = password
225 225 user.save
226 226 end
227 227 @changed = true
228 228 end
229 229 end
230 230
231 +
231 232 # contest management
232 233
233 234 def contests
234 235 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
235 236 @contests = Contest.enabled
236 237 end
237 238
238 239 def assign_from_list
239 240 contest_id = params[:users_contest_id]
240 241 org_contest, users = find_contest_and_user_from_contest_id(contest_id)
241 242 contest = Contest.find(params[:new_contest][:id])
242 243 if !contest
@@ -414,38 +415,45
414 415 @users = User.where('login REGEXP ?',params[:regex]) if params[:regex]
415 416 @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
416 417 rescue Exception
417 418 flash[:error] = 'Regular Expression is malformed'
418 419 @users = nil
419 420 end
420 421
421 422 if params[:commit]
422 423 @action = {}
423 424 @action[:set_enable] = params[:enabled]
424 425 @action[:enabled] = params[:enable] == "1"
425 426 @action[:gen_password] = params[:gen_password]
427 + @action[:add_group] = params[:add_group]
428 + @action[:group_name] = params[:group_name]
426 429 end
427 430
428 431 if params[:commit] == "Perform"
429 432 if @action[:set_enable]
430 433 @users.update_all(enabled: @action[:enabled])
431 434 end
432 435 if @action[:gen_password]
433 436 @users.each do |u|
434 437 password = random_password
435 438 u.password = password
436 439 u.password_confirmation = password
437 440 u.save
438 441 end
439 442 end
443 + if @action[:add_group]
444 + @uses.each do |u|
445 +
446 + end
447 + end
440 448 end
441 449 end
442 450
443 451 protected
444 452
445 453 def random_password(length=5)
446 454 chars = 'abcdefghijkmnopqrstuvwxyz23456789'
447 455 newpass = ""
448 456 length.times { newpass << chars[rand(chars.size-1)] }
449 457 return newpass
450 458 end
451 459
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -37,24 +37,33
37 37 %label.radio-inline
38 38 = radio_button_tag "enable", 1, params[:enable] == '1', id: 'enable-yes'
39 39 Yes
40 40 .col-md-3
41 41 %label.radio-inline
42 42 = radio_button_tag "enable", 0, params[:enable] == '0', id: 'enable-no'
43 43 No
44 44 .row.form-group
45 45 .col-md-6
46 46 %label.checkbox-inline
47 47 = check_box_tag "gen_password", true, params[:gen_password]
48 48 Generate new random password
49 + .row.form-group
50 + .col-md-4
51 + %label.checkbox-inline
52 + = check_box_tag "add_group", true, params[:add_group]
53 + Add users to group
54 + %label.col-md-3.control-label.text-right Group name
55 + .col-md-5
56 + = text_field_tag "group_name", params[:group_name], id: 'group_name',class: 'form-control select2'
57 +
49 58
50 59 .row
51 60 .col-md-12
52 61 = submit_tag "Preview Result", class: 'btn btn-default'
53 62 - if @users
54 63 .row
55 64 .col-md-4
56 65 - if @action
57 66 %h2 Confirmation
58 67 - if @action[:set_enable]
59 68 .alert.alert-info The following users will be set #{(@action[:enabled] ? 'enable' : 'disable')}.
60 69 - if @action[:gen_password]
You need to be logged in to leave comments. Login now