cafe-grader-web Commit - r675:4404040ff0ce

cafe-grader-web

parent | child

Description:

sort available problem group by date_added, name bulk manage user filter by remark as well

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r675:4404040ff0ce - Mon, 11 Sep 2017 16:34:17 - 2 files changed: 12 inserted, 2 deleted

app/controllers/user_admin_controller.rb ¶ +1 -1

                     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 ?',params[:regex]) if params[:regex]
+            +       @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
                   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]

app/models/user.rb ¶ +11 -1

                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems
                   end
                 end
                 def available_problems_in_group
                   problem = []
                   self.groups.each do |group|
                     group.problems.where(available: true).each { |p| problem << p }
                   end
-            -     return problem.uniq
+            +     problem.uniq!.sort! do |a,b|
+            +       case
+            +       when a.date_added < b.date_added
+            +         -1
+            +       when a.date_added > b.date_added
+            +         1
+            +       else
+            +         a.name <=> b.name
+            +       end
+            +     end
+            +     return problem
                 end
                 def can_view_problem?(problem)
                   if not GraderConfiguration.multicontests?
                     return problem.available
                   else
                     return problem_in_user_contests? problem
                   end
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)

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

	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