# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2018-07-08 07:57:57
# Node ID 06d038074b56a880a2b4194a3dac49cc3b2fb8db
# Parent  c4ba92966e8e055a24850e07b63d4de23d7b98e4
# Parent  e07a92cfc790797349e050004276dca587bf513b

merge algo with tip

diff --git a/app/controllers/problems_controller.rb b/app/controllers/problems_controller.rb
--- a/app/controllers/problems_controller.rb
+++ b/app/controllers/problems_controller.rb
@@ -187,7 +187,7 @@
   end
 
   def do_manage
-    if params.has_key? 'change_date_added'
+    if params.has_key? 'change_date_added' and params[:date_added].strip.empty? == false
       change_date_added
     elsif params.has_key? 'add_to_contest'
       add_to_contest
diff --git a/app/controllers/report_controller.rb b/app/controllers/report_controller.rb
--- a/app/controllers/report_controller.rb
+++ b/app/controllers/report_controller.rb
@@ -43,7 +43,7 @@
     end
 
     #users
-    @users = if params[:user] == "all" then 
+    @users = if params[:users] == "all" then 
                User.includes(:contests).includes(:contest_stat)
              else 
                User.includes(:contests).includes(:contest_stat).where(enabled: true)
diff --git a/app/views/problems/manage.html.haml b/app/views/problems/manage.html.haml
--- a/app/views/problems/manage.html.haml
+++ b/app/views/problems/manage.html.haml
@@ -110,6 +110,7 @@
   $('.input-group.date').datetimepicker({
     format: 'DD/MMM/YYYY',
     showTodayButton: true,
+    locale: 'en',
     widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
 
   });
diff --git a/app/views/sites/edit.html.haml b/app/views/sites/edit.html.haml
--- a/app/views/sites/edit.html.haml
+++ b/app/views/sites/edit.html.haml
@@ -31,6 +31,7 @@
 :javascript
   $('.input-group.date').datetimepicker({
     format: 'DD/MMM/YYYY HH:mm',
+    locale: 'en',
     showTodayButton: true,
   });