# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2017-09-11 16:34:17
# Node ID 4404040ff0ceea75d75187519c27d18b517d2ae2
# Parent  35025e5d85ac3fc8942aabe73c601c037ed5099b

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

diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb
--- a/app/controllers/user_admin_controller.rb
+++ b/app/controllers/user_admin_controller.rb
@@ -412,7 +412,7 @@
   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'
diff --git a/app/models/user.rb b/app/models/user.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -317,7 +317,17 @@
     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)