# HG changeset patch # User Nattee Niparnan # Date 2018-06-12 12:52:19 # Node ID 7917a0f3fcefd041fbd82e9c2060879cbb684f7b # Parent 887b14563488b3078896bc270ea9c529fdc72c61 Fix bug #23, #22, #21, #17 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, });