cafe-grader-web

Commit r808:8690f354dd15 public

parent | child
Description:
update new list of users
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

r808:8690f354dd15 - - 5 files changed: 116 inserted, 88 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,5
1 + class AddIndexToTaskStatus < ActiveRecord::Migration[5.2]
2 + def change
3 + add_index :tasks, :status
4 + end
5 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -39,7 +39,7
39 39 redirect_to :action => 'index'
40 40 else
41 41 render :action => 'new'
42 - end
42 + end
43 43 end
44 44
45 45 def clear_last_ip
@@ -52,92 +52,23
52 52 def create_from_list
53 53 lines = params[:user_list]
54 54
55 - note = []
56 - error_note = []
57 - error_msg = nil
58 - ok_user = []
59 -
60 - lines.split("\n").each do |line|
61 - #split with large limit, this will cause consecutive ',' to be result in a blank
62 - items = line.chomp.split(',',1000)
63 - if items.length>=2
64 - login = items[0]
65 - full_name = items[1]
66 - remark =''
67 - user_alias = ''
68 -
69 - added_random_password = false
70 - added_password = false
71 - if items.length >= 3
72 - if items[2].chomp(" ").length > 0
73 - password = items[2].chomp(" ")
74 - added_password = true
75 - end
76 - else
77 - password = random_password
78 - added_random_password=true;
79 - end
80 -
81 - if items.length>= 4 and items[3].chomp(" ").length > 0;
82 - user_alias = items[3].chomp(" ")
83 - else
84 - user_alias = login
85 - end
86 -
87 55
88 - has_remark = false
89 - if items.length>=5
90 - remark = items[4].strip;
91 - has_remark = true
92 - end
56 + res = User.create_from_list(lines)
57 + error_logins = res[:error_logins]
58 + error_msg = res[:first_error]
59 + ok_user = res[:created_users]
93 60
94 - user = User.find_by_login(login)
95 - if (user)
96 - user.full_name = full_name
97 - user.remark = remark if has_remark
98 - user.password = password if added_password || added_random_password
99 - else
100 - #create a random password if none are given
101 - password = random_password unless password
102 - user = User.new({:login => login,
103 - :full_name => full_name,
104 - :password => password,
105 - :password_confirmation => password,
106 - :alias => user_alias,
107 - :remark => remark})
108 - end
109 - user.activated = true
110 -
111 - if user.save
112 - if added_random_password
113 - note << "'#{login}' (+)"
114 - else
115 - note << login
116 - end
117 - ok_user << user
118 - else
119 - error_note << "'#{login}'"
120 - error_msg = user.errors.full_messages.to_sentence unless error_msg
121 - end
122 -
123 - end
124 - end
125 61
126 62 #add to group
127 63 if params[:add_to_group]
128 - group = Group.where(id: params[:group_id]).first
129 - if group
130 - group.users << ok_user
131 - end
64 + group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user)
132 65 end
133 66
134 67 # show flash
135 - if note.size > 0
136 - flash[:success] = 'User(s) ' + note.join(', ') +
137 - ' were successfully created. ' +
138 - '( (+) - created with random passwords.)'
68 + if ok_user.count > 0
69 + flash[:success] = "#{ok_user.count} user(s) was created or updated successfully"
139 70 end
140 - if error_note.size > 0
71 + if error_logins.size > 0
141 72 flash[:error] = "Following user(s) failed to be created: " + error_note.join(', ') + ". The error of the first failed one are: " + error_msg;
142 73 end
143 74 redirect_to :action => 'index'
@@ -401,7 +332,7
401 332 flash[:notice] = 'You entered an empty mail subject.'
402 333 redirect_to :action => 'mass_mailing' and return
403 334 end
404 -
335 +
405 336 mail_body = params[:email_body]
406 337 if !mail_body or mail_body.blank?
407 338 flash[:notice] = 'You entered an empty mail body.'
@@ -417,7 +348,7
417 348 note << user.login
418 349 end
419 350 end
420 -
351 +
421 352 flash[:notice] = 'User(s) ' + note.join(', ') +
422 353 ' were successfully modified. '
423 354 redirect_to :action => 'mass_mailing'
@@ -426,9 +357,14
426 357 #bulk manage
427 358 def bulk_manage
428 359
429 - begin
430 - @users = User.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) if params[:regex]
431 - @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
360 + begin
361 + if params[:filter_group]
362 + @users = Group.find_by(id: params[:filter_group_id]).users
363 + else
364 + @users = User.all
365 + end
366 + @users = @users.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) unless params[:regex].blank?
367 + @users.count if @users #test the sql
432 368 rescue Exception
433 369 flash[:error] = 'Regular Expression is malformed'
434 370 @users = nil
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -8,6 +8,13
8 8 #has_and_belongs_to_many :problems
9 9 #has_and_belongs_to_many :users
10 10
11 + def add_users_skip_existing(users_list)
12 + new_list = []
13 + users_list.each do |u|
14 + new_list << u unless users.include? u
15 + end
16 + users << new_list
17 + end
11 18
12 19 end
13 20
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -136,10 +136,6
136 136 password
137 137 end
138 138
139 - def self.find_non_admin_with_prefix(prefix='')
140 - users = User.all
141 - return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 }
142 - end
143 139
144 140 # Contest information
145 141
@@ -314,13 +310,91
314 310 User.update_all(:last_ip => nil)
315 311 end
316 312
313 + #create multiple user, one per lines of input
314 + def self.create_from_list(lines)
315 + error_logins = []
316 + first_error = nil
317 + created_users = []
318 +
319 + lines.split("\n").each do |line|
320 + #split with large limit, this will cause consecutive ',' to be result in a blank
321 + items = line.chomp.split(',',1000)
322 + if items.length>=2
323 + login = items[0]
324 + full_name = items[1]
325 + remark =''
326 + user_alias = ''
327 +
328 + added_random_password = false
329 + added_password = false
330 +
331 + #given password?
332 + if items.length >= 3
333 + if items[2].chomp(" ").length > 0
334 + password = items[2].chomp(" ")
335 + added_password = true
336 + end
337 + else
338 + password = random_password
339 + added_random_password=true;
340 + end
341 +
342 + #given alias?
343 + if items.length>= 4 and items[3].chomp(" ").length > 0;
344 + user_alias = items[3].chomp(" ")
345 + else
346 + user_alias = login
347 + end
348 +
349 + #given remark?
350 + has_remark = false
351 + if items.length>=5
352 + remark = items[4].strip;
353 + has_remark = true
354 + end
355 +
356 + user = User.find_by_login(login)
357 + if (user)
358 + user.full_name = full_name
359 + user.remark = remark if has_remark
360 + user.password = password if added_password || added_random_password
361 + else
362 + #create a random password if none are given
363 + password = random_password unless password
364 + user = User.new({:login => login,
365 + :full_name => full_name,
366 + :password => password,
367 + :password_confirmation => password,
368 + :alias => user_alias,
369 + :remark => remark})
370 + end
371 + user.activated = true
372 +
373 + if user.save
374 + created_users << user
375 + else
376 + error_logins << "'#{login}'"
377 + first_error = user.errors.full_messages.to_sentence unless first_error
378 + end
379 + end
380 + end
381 +
382 + return {error_logins: error_logins, first_error: first_error, created_users: created_users}
383 +
384 + end
385 +
386 + def self.find_non_admin_with_prefix(prefix='')
387 + users = User.all
388 + return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 }
389 + end
390 +
317 391 protected
318 392 def encrypt_new_password
319 393 return if password.blank?
320 394 self.salt = (10+rand(90)).to_s
321 395 self.hashed_password = User.encrypt(self.password,self.salt)
322 396 end
323 -
397 +
324 398 def assign_default_site
325 399 # have to catch error when migrating (because self.site is not available).
326 400 begin
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -23,6 +23,12
23 23 %li
24 24 %code 21$
25 25 matches every user whose login ends with "21"
26 + .form-group
27 + .div.checkbox
28 + %label
29 + = check_box_tag :filter_group, 1, params[:filter_group] == '1'
30 + Apply to this group only
31 + = select_tag "filter_group_id", options_from_collection_for_select( Group.all, 'id','name',params[:filter_group_id]), id: 'group_name',class: 'select2'
26 32 .col-md-6
27 33 .panel.panel-primary
28 34 .panel-title.panel-heading
You need to be logged in to leave comments. Login now