cafe-grader-web Commit - r808:8690f354dd15

cafe-grader-web

Commit `r808:8690f354dd15` public

parent | child

Description:

update new list of users

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r808:8690f354dd15 - Mon, 09 Aug 2021 16:34:02 - 5 files changed: 116 inserted, 88 deleted

db/migrate/20210809105935_add_index_to_task_status.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddIndexToTaskStatus < ActiveRecord::Migration[5.2]
	2	+ def change
	3	+ add_index :tasks, :status
	4	+ end
	5	+ end

app/controllers/user_admin_controller.rb ¶ +19 -83

                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(user_params)
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'index'
                   else
                     render :action => 'new'
-            -     end
+            +     end
                 end
                 def clear_last_ip
                   @user = User.find(params[:id])
                   @user.last_ip = nil
                   @user.save
                   redirect_to action: 'index', page: params[:page]
                 end
                 def create_from_list
                   lines = params[:user_list]
-            -     note = []
-            -     error_note = []
-            -     error_msg = nil
-            -     ok_user = []
-            -     lines.split("\n").each do |line|
-            -       #split with large limit, this will cause consecutive ',' to be result in a blank
-            -       items = line.chomp.split(',',1000)
-            -       if items.length>=2
-            -         login = items[0]
-            -         full_name = items[1]
-            -         remark =''
-            -         user_alias = ''
-            -         added_random_password = false
-            -         added_password = false
-            -         if items.length >= 3
-            -           if items[2].chomp(" ").length > 0
-            -             password = items[2].chomp(" ")
-            -             added_password = true
-            -           end
-            -         else
-            -           password = random_password
-            -           added_random_password=true;
-            -         end
-            -         if items.length>= 4 and items[3].chomp(" ").length > 0;
-            -           user_alias = items[3].chomp(" ")
-            -         else
-            -           user_alias = login
-            -         end
-            -         has_remark = false
+            +     res = User.create_from_list(lines)
-            -         if items.length>=5
+            +     error_logins = res[:error_logins]
-            -           remark = items[4].strip;
+            +     error_msg = res[:first_error]
-            -           has_remark = true
+            +     ok_user = res[:created_users]
-            -         end
-            -         user = User.find_by_login(login)
-            -         if (user)
-            -           user.full_name = full_name
-            -           user.remark = remark if has_remark
-            -           user.password = password if added_password || added_random_password
-            -         else
-            -           #create a random password if none are given
-            -           password = random_password unless password
-            -           user = User.new({:login => login,
-            -                            :full_name => full_name,
-            -                            :password => password,
-            -                            :password_confirmation => password,
-            -                            :alias => user_alias,
-            -                            :remark => remark})
-            -         end
-            -         user.activated = true
-            -         if user.save
-            -           if added_random_password
-            -             note << "'#{login}' (+)"
-            -           else
-            -             note << login
-            -           end
-            -           ok_user << user
-            -         else
-            -           error_note << "'#{login}'"
-            -           error_msg = user.errors.full_messages.to_sentence unless error_msg
-            -         end
-            -       end
-            -     end
                   #add to group
                   if params[:add_to_group]
-            -       group = Group.where(id: params[:group_id]).first
+            +       group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user)
-            -       if group
-            -         group.users << ok_user
-            -       end
                   end
                   # show flash
-            -     if note.size > 0
+            +     if ok_user.count > 0
-            -       flash[:success] = 'User(s) ' + note.join(', ') +
+            +       flash[:success] = "#{ok_user.count} user(s) was created or updated successfully"
-            -         ' were successfully created.  ' +
-            -         '( (+) - created with random passwords.)'
                   end
-            -     if error_note.size > 0
+            +     if error_logins.size > 0
                     flash[:error] = "Following user(s) failed to be created: " + error_note.join(', ') + ". The error of the first failed one are: " + error_msg;
                   end
                   redirect_to :action => 'index'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(user_params)
                 def bulk_mail
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_subject = params[:subject]
                   if !mail_subject or mail_subject.blank?
                     flash[:notice] = 'You entered an empty mail subject.'
                     redirect_to :action => 'mass_mailing' and return
                   end
+            +
                   mail_body = params[:email_body]
                   if !mail_body or mail_body.blank?
                     flash[:notice] = 'You entered an empty mail body.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                       send_mail(user.email, mail_subject, mail_body)
                       note << user.login
                     end
                   end
+            +
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'mass_mailing'
                 end
                 #bulk manage
                 def bulk_manage
-            -     begin
+            +     begin
-            -       @users = User.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) if params[:regex]
+            +       if params[:filter_group]
-            -       @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
+            +         @users = Group.find_by(id: params[:filter_group_id]).users
+            +       else
+            +         @users = User.all
+            +       end
+            +       @users = @users.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) unless params[:regex].blank?
+            +       @users.count if @users #test the sql
                   rescue Exception
                     flash[:error] = 'Regular Expression is malformed'
                     @users = nil
                   end
                   if params[:commit]
                     @action = {}
                     @action[:set_enable] = params[:enabled]
                     @action[:enabled] = params[:enable] == "1"
                     @action[:gen_password] = params[:gen_password]
                     @action[:add_group] = params[:add_group]
                     @action[:group_name] = params[:group_name]

app/models/group.rb ¶ +7

               class Group < ActiveRecord::Base
                 has_many :groups_problems, class_name: 'GroupProblem'
                 has_many :problems, :through => :groups_problems
                 has_many :groups_users, class_name: 'GroupUser'
                 has_many :users, :through => :groups_users
                 #has_and_belongs_to_many :problems
                 #has_and_belongs_to_many :users
+            +   def add_users_skip_existing(users_list)
+            +     new_list = []
+            +     users_list.each do |u|
+            +       new_list << u unless users.include? u
+            +     end
+            +     users << new_list
+            +   end
               end

app/models/user.rb ¶ +79 -5

@@ -127,28 +127,24
127		127
128	def verify_activation_key(key)	128	def verify_activation_key(key)
129	key == activation_key	129	key == activation_key
130	end	130	end
131		131
132	def self.random_password(length=5)	132	def self.random_password(length=5)
133	chars = 'abcdefghjkmnopqrstuvwxyz'	133	chars = 'abcdefghjkmnopqrstuvwxyz'
134	password = ''	134	password = ''
135	length.times { password << chars[rand(chars.length - 1)] }	135	length.times { password << chars[rand(chars.length - 1)] }
136	password	136	password
137	end	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	# Contest information	140	# Contest information
145		141
146	def self.find_users_with_no_contest()	142	def self.find_users_with_no_contest()
147	users = User.all	143	users = User.all
148	return users.find_all { \|u\| u.contests.length == 0 }	144	return users.find_all { \|u\| u.contests.length == 0 }
149	end	145	end
150		146
151		147
152	def contest_time_left	148	def contest_time_left
153	if GraderConfiguration.contest_mode?	149	if GraderConfiguration.contest_mode?
154	return nil if site==nil	150	return nil if site==nil
@@ -305,31 +301,109
305		301
306	#check if the user has the right to view that problem	302	#check if the user has the right to view that problem
307	#this also consider group based problem policy	303	#this also consider group based problem policy
308	def can_view_problem?(problem)	304	def can_view_problem?(problem)
309	return true if admin?	305	return true if admin?
310	return available_problems.include? problem	306	return available_problems.include? problem
311	end	307	end
312		308
313	def self.clear_last_login	309	def self.clear_last_login
314	User.update_all(:last_ip => nil)	310	User.update_all(:last_ip => nil)
315	end	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	protected	391	protected
318	def encrypt_new_password	392	def encrypt_new_password
319	return if password.blank?	393	return if password.blank?
320	self.salt = (10+rand(90)).to_s	394	self.salt = (10+rand(90)).to_s
321	self.hashed_password = User.encrypt(self.password,self.salt)	395	self.hashed_password = User.encrypt(self.password,self.salt)
322	end	396	end
323	-	397	+
324	def assign_default_site	398	def assign_default_site
325	# have to catch error when migrating (because self.site is not available).	399	# have to catch error when migrating (because self.site is not available).
326	begin	400	begin
327	if self.site==nil	401	if self.site==nil
328	self.site = Site.find_by_name('default')	402	self.site = Site.find_by_name('default')
329	if self.site==nil	403	if self.site==nil
330	self.site = Site.find(1) # when 'default has be renamed'	404	self.site = Site.find(1) # when 'default has be renamed'
331	end	405	end
332	end	406	end
333	rescue	407	rescue
334	end	408	end
335	end	409	end

app/views/user_admin/bulk_manage.html.haml ¶ +6

                       %p
                         Example
                       %ul
                         %li
                           %code root
                           matches every user whose login contains "root"
                         %li
                           %code ^56
                           matches every user whose login starts with "56"
                         %li
                           %code 21$
                           matches every user whose login ends with "21"
+            +         .form-group
+            +           .div.checkbox
+            +             %label
+            +               = check_box_tag :filter_group, 1, params[:filter_group] == '1'
+            +               Apply to this group only
+            +             = select_tag "filter_group_id", options_from_collection_for_select( Group.all, 'id','name',params[:filter_group_id]), id: 'group_name',class: 'select2'
                 .col-md-6
                   .panel.panel-primary
                     .panel-title.panel-heading
                       Action
                     .panel-body
                       .row.form-group
                         .col-md-6
                           %label.checkbox-inline
                             = check_box_tag "enabled", true, params[:enabled]
                             Change "Enabled" to
                         .col-md-3
                           %label.radio-inline

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r808:8690f354dd15 - Mon, 09 Aug 2021 16:34:02 - 5 files changed: 116 inserted, 88 deleted

Sign in to your account

Commit r808:8690f354dd15 public

Author

r808:8690f354dd15 - Mon, 09 Aug 2021 16:34:02 - 5 files changed: 116 inserted, 88 deleted

Commit `r808:8690f354dd15` public