cafe-grader-web Commit - r843:2e56e1493802

cafe-grader-web

Commit `r843:2e56e1493802` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r843:2e56e1493802 - Mon, 09 Aug 2021 17:17:42 - 5 files changed: 39 inserted, 85 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

                   @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
-            -         if items.length>=5
-            -           remark = items[4].strip;
-            -           has_remark = true
-            -         end
+            +     res = User.create_from_list(lines)
+            +     error_logins = res[:error_logins]
+            +     error_msg = res[:first_error]
+            +     ok_user = res[:created_users]
-            -         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
-            -       if group
-            -         group.users << ok_user
-            -       end
+            +       group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user)
                   end
                   # show flash
-            -     if note.size > 0
-            -       flash[:success] = 'User(s) ' + note.join(', ') +
-            -         ' were successfully created.  ' +
-            -         '( (+) - created with random passwords.)'
+            +     if ok_user.count > 0
+            +       flash[:success] = "#{ok_user.count} user(s) was created or updated successfully"
                   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
                   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
                     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
-            -       @users = User.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) if params[:regex]
-            -       @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
+            +     begin
+            +       if params[:filter_group]
+            +         @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]

app/models/group.rb ¶ +7

                 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.uniq.each do |u|
+            +       new_list << u unless users.include? u
+            +     end
+            +     users << new_list
+            +   end
               end

app/views/groups/show.html.haml ¶ +2 -2

                             page. You can also use
                             = link_to 'Bulk Manage User', bulk_manage_user_admin_index_path
                             page.
                         =form_tag add_user_group_path(@group), class: 'form-inline' do
                           .form-group
                             =label_tag :user_id, "User"
-            -               =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2', style: 'width: 10em';
+            +               =select_tag :user_id, options_from_collection_for_select(User.all,'id','login_with_name'), class: 'select2', style: 'width: 25em';
                           =submit_tag "Add",class: 'btn btn-primary'
                         %table.table.table-hover
                           %thead
                             %tr
                             If you want to add several problem to a group, it may be easier to bulk manage them in the
                             = link_to 'Bulk Manage Problems', manage_problems_path
                             page
                         =form_tag add_problem_group_path(@group), class: 'form-inline' do
                           .form-group
                             =label_tag :problem_id, "Problem"
-            -               =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2', style: 'width: 10em';
+            +               =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','long_name'), class: 'select2', style: 'width: 25em';
                           =submit_tag "Add",class: 'btn btn-primary'
                         %table.table.table-hover
                           %thead
                             %tr

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

                         %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

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

r843:2e56e1493802 - Mon, 09 Aug 2021 17:17:42 - 5 files changed: 39 inserted, 85 deleted

Sign in to your account

Commit r843:2e56e1493802 public

Author

r843:2e56e1493802 - Mon, 09 Aug 2021 17:17:42 - 5 files changed: 39 inserted, 85 deleted

Commit `r843:2e56e1493802` public