Fix datetime delocalization issues by using ISO8601 time format

Closes #3344

.rubocop_todo.yml

@@ -440,7 +440,6 @@ Style/RescueStandardError:
   Exclude:
     - 'lib/rails_admin/adapters/mongoid.rb'
     - 'lib/rails_admin/adapters/mongoid/bson.rb'
-    - 'lib/rails_admin/support/i18n.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.

app/assets/javascripts/rails_admin/ra.filter-box.js

@@ -34,57 +34,46 @@
             }
           break;
         case 'date':
-          additional_control =
-            $('<input size="20" class="date additional-fieldset default input-sm form-control" type="text" />')
-            .css('display', (!field_operator || field_operator == "default") ? 'inline-block' : 'none')
-            .prop('name', value_name + '[]')
-            .prop('value', field_value[0] || '')
-            .add(
-              $('<input size="20" placeholder="-∞" class="date additional-fieldset between input-sm form-control" type="text" />')
-              .css('display', (field_operator == "between") ? 'inline-block' : 'none')
-              .prop('name', value_name + '[]')
-              .prop('value', field_value[1] || '')
-            )
-            .add(
-              $('<input size="20" placeholder="∞" class="date additional-fieldset between input-sm form-control" type="text" />')
-              .css('display', (field_operator == "between") ? 'inline-block' : 'none')
-              .prop('name', value_name + '[]')
-              .prop('value', field_value[2] || '')
-            );
         case 'datetime':
         case 'timestamp':
+        case 'time':
           control = control || $('<select class="switch-additional-fieldsets input-sm form-control"></select>')
             .prop('name', operator_name)
-            .append($('<option data-additional-fieldset="default" value="default"></option>').prop('selected', field_operator == "default").text(RailsAdmin.I18n.t("date")))
+            .append($('<option data-additional-fieldset="default" value="default"></option>').prop('selected', field_operator == "default").text(RailsAdmin.I18n.t(field_type == "time" ? "time" : "date")))
             .append($('<option data-additional-fieldset="between" value="between"></option>').prop('selected', field_operator == "between").text(RailsAdmin.I18n.t("between_and_")))
-            .append($('<option value="today"></option>').prop('selected', field_operator == "today").text(RailsAdmin.I18n.t("today")))
-            .append($('<option value="yesterday"></option>').prop('selected', field_operator == "yesterday").text(RailsAdmin.I18n.t("yesterday")))
-            .append($('<option value="this_week"></option>').prop('selected', field_operator == "this_week").text(RailsAdmin.I18n.t("this_week")))
-            .append($('<option value="last_week"></option>').prop('selected', field_operator == "last_week").text(RailsAdmin.I18n.t("last_week")))
+          if (field_type != 'time') {
+            control.append([
+              $('<option value="today"></option>').prop('selected', field_operator == "today").text(RailsAdmin.I18n.t("today")),
+              $('<option value="yesterday"></option>').prop('selected', field_operator == "yesterday").text(RailsAdmin.I18n.t("yesterday")),
+              $('<option value="this_week"></option>').prop('selected', field_operator == "this_week").text(RailsAdmin.I18n.t("this_week")),
+              $('<option value="last_week"></option>').prop('selected', field_operator == "last_week").text(RailsAdmin.I18n.t("last_week")),
+            ])
+          }
           if (!required) {
             control.append([
               '<option disabled="disabled">---------</option>',
               $('<option value="_not_null"></option>').prop('selected', field_operator == "_not_null").text(RailsAdmin.I18n.t("is_present")),
               $('<option value="_null"></option>').prop('selected', field_operator == "_null").text(RailsAdmin.I18n.t("is_blank"))
             ])
           }
-          additional_control = additional_control ||
-            $('<input size="25" class="datetime additional-fieldset default input-sm form-control" type="text" />')
-            .css('display', (!field_operator || field_operator == "default") ? 'inline-block' : 'none')
-            .prop('name', value_name + '[]')
-            .prop('value', field_value[0] || '')
-            .add(
-              $('<input size="25" placeholder="-∞" class="datetime additional-fieldset between input-sm form-control" type="text" />')
-              .css('display', (field_operator == "between") ? 'inline-block' : 'none')
-              .prop('name', value_name + '[]')
-              .prop('value', field_value[1] || '')
-            )
-            .add(
-              $('<input size="25" placeholder="∞" class="datetime additional-fieldset between input-sm form-control" type="text" />')
-              .css('display', (field_operator == "between") ? 'inline-block' : 'none')
-              .prop('name', value_name + '[]')
-              .prop('value', field_value[2] || '')
-            );
+          additional_control =
+            $.map([undefined, '-∞', '∞'], function(placeholder, index){
+              var visible = index == 0 ? (!field_operator || field_operator == "default") : (field_operator == "between");
+              return $('<span class="additional-fieldset"></span>')
+                .addClass(index == 0 ? 'default' : 'between')
+                .css('display', visible ? 'inline-block' : 'none')
+                .html(
+                  $('<input type="hidden" />')
+                    .prop('name', value_name + '[]')
+                    .prop('value', field_value[index] || '')
+                    .add(
+                      $('<input class="input-sm form-control" type="text" />')
+                        .addClass(field_type == 'date' ? 'date' : 'datetime')
+                        .prop('size', field_type == 'date' || field_type == 'time' ? 20 : 25)
+                        .prop('placeholder', placeholder)
+                    )
+                );
+            });
           break;
         case 'enum':
           var multiple_values = ((field_value instanceof Array) ? true : false)
@@ -193,10 +182,18 @@
 
       $('#filters_box').append($content);
 
-      $content.find('.date, .datetime').datetimepicker({
-        locale: RailsAdmin.I18n.locale,
-        showTodayButton: true,
-        format: options['datetimepicker_format']
+      $content.find('.date, .datetime').each(function() {
+        $(this).datetimepicker({
+          date: moment($(this).siblings('[type=hidden]').val()),
+          locale: RailsAdmin.I18n.locale,
+          showTodayButton: true,
+          format: options['datetimepicker_format']
+        });
+        $(this).on('dp.change', function(e) {
+          if (e.date) {
+            $(this).siblings('[type=hidden]').val(e.date.format('YYYY-MM-DD[T]HH:mm:ss'));
+          }
+        });
       });
 
       $("hr.filters_box:hidden").show('slow');

app/assets/javascripts/rails_admin/ra.widgets.js

@@ -37,9 +37,15 @@
         var options;
         options = $(this).data('options');
         $.extend(options, {
+          date: moment($(this).siblings('[type=hidden]').val()),
           locale: RailsAdmin.I18n.locale
         });
         $(this).datetimepicker(options);
+        $(this).on('dp.change', function(e) {
+          if (e.date) {
+            $(this).siblings('[type=hidden]').val(e.date.format('YYYY-MM-DD[T]HH:mm:ss'));
+          }
+        });
       });
       content.find('[data-enumeration]').each(function() {
         if ($(this).is('[multiple]')) {

app/helpers/rails_admin/application_helper.rb

@@ -1,9 +1,5 @@
-require 'rails_admin/support/i18n'
-
 module RailsAdmin
   module ApplicationHelper
-    include RailsAdmin::Support::I18n
-
     def capitalize_first_letter(wording)
       return nil unless wording.present? && wording.is_a?(String)
 

app/helpers/rails_admin/main_helper.rb

@@ -69,7 +69,7 @@ def ordered_filter_options
         when :enum
           options[:select_options] = options_for_select(field.with(object: @abstract_model.model.new).enum, filter_hash['v'])
         when :date, :datetime, :time
-          options[:datetimepicker_format] = field.parser.to_momentjs
+          options[:datetimepicker_format] = field.momentjs_format
         end
         options[:label] = field.label
         options[:name]  = field.name

app/views/rails_admin/main/_form_datetime.html.haml

@@ -1,5 +1,6 @@
 .form-inline
   .input-group
-    = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({value: field.form_value, class: 'form-control', data: {datetimepicker: true, options: field.datepicker_options.to_json}})
+    = form.hidden_field(field.method_name, id: nil, value: field.form_value)
+    = form.text_field field.method_name, field.html_attributes.reverse_merge({class: 'form-control', data: {datetimepicker: true, options: field.datepicker_options.to_json}, name: nil, value: nil})
     = form.label(field.method_name, class: 'input-group-addon') do
       %i.fa.fa-fw.fa-calendar

app/views/rails_admin/main/index.html.haml

@@ -35,7 +35,7 @@
           - else
             - ''
           %li
-            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-operator" => field.default_filter_operator, :"data-field-options" => field_options.html_safe, :"data-field-required" => field.required.to_s, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
+            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-operator" => field.default_filter_operator, :"data-field-options" => field_options.html_safe, :"data-field-required" => field.required.to_s, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => field.try(:momentjs_format)}= capitalize_first_letter(field.label)
 
 %style
   - properties.select{ |p| p.column_width.present? }.each do |property|

config/locales/rails_admin.en.yml

@@ -11,6 +11,7 @@ en:
       yesterday: Yesterday
       this_week: This week
       last_week: Last week
+      time: Time ...
       number: Number ...
       contains: Contains
       is_exactly: Is exactly

lib/rails_admin/abstract_model.rb

@@ -139,7 +139,7 @@ def build_statement_for_type_generic
           case @type
           when :date
             build_statement_for_date
-          when :datetime, :timestamp
+          when :datetime, :timestamp, :time
             build_statement_for_datetime_or_timestamp
           end
         end
@@ -178,8 +178,8 @@ def build_statement_for_date
 
       def build_statement_for_datetime_or_timestamp
         start_date, end_date = get_filtering_duration
-        start_date = start_date.try(:beginning_of_day) if start_date
-        end_date = end_date.try(:end_of_day) if end_date
+        start_date = start_date.beginning_of_day if start_date.is_a?(Date)
+        end_date = end_date.end_of_day if end_date.is_a?(Date)
         range_filter(start_date, end_date)
       end
 

lib/rails_admin/adapters/active_record.rb

@@ -205,7 +205,9 @@ def boolean_unary_operators
         alias_method :numeric_unary_operators, :boolean_unary_operators
 
         def range_filter(min, max)
-          if min && max
+          if min && max && min == max
+            ["(#{@column} = ?)", min]
+          elsif min && max
             ["(#{@column} BETWEEN ? AND ?)", min, max]
           elsif min
             ["(#{@column} >= ?)", min]

lib/rails_admin/adapters/mongoid.rb

@@ -283,7 +283,9 @@ def build_statement_for_belongs_to_association_or_bson_object_id
         end
 
         def range_filter(min, max)
-          if min && max
+          if min && max && min == max
+            {@column => min}
+          elsif min && max
             {@column => {'$gte' => min, '$lte' => max}}
           elsif min
             {@column => {'$gte' => min}}

lib/rails_admin/config/fields/types/date.rb

@@ -7,6 +7,10 @@ module Types
         class Date < RailsAdmin::Config::Fields::Types::Datetime
           RailsAdmin::Config::Fields::Types.register(self)
 
+          def parse_value(value)
+            ::Date.parse(value) if value.present?
+          end
+
           register_instance_option :date_format do
             :long
           end
@@ -15,13 +19,6 @@ class Date < RailsAdmin::Config::Fields::Types::Datetime
             [:date, :formats]
           end
 
-          register_instance_option :datepicker_options do
-            {
-              showTodayButton: true,
-              format: parser.to_momentjs,
-            }
-          end
-
           register_instance_option :html_attributes do
             {
               required: required?,

lib/rails_admin/config/fields/types/datetime.rb

@@ -8,27 +8,14 @@ module Types
         class Datetime < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types.register(self)
 
-          def parser
-            RailsAdmin::Support::Datetime.new(strftime_format)
-          end
-
           def parse_value(value)
-            parser.parse_string(value)
+            ::Time.zone.parse(value)
           end
 
           def parse_input(params)
             params[name] = parse_value(params[name]) if params[name]
           end
 
-          def value
-            parent_value = super
-            if %w(DateTime Date Time).include?(parent_value.class.name)
-              parent_value.in_time_zone
-            else
-              parent_value
-            end
-          end
-
           register_instance_option :date_format do
             :long
           end
@@ -43,10 +30,14 @@ def value
             "%B %d, %Y %H:%M"
           end
 
+          def momentjs_format
+            RailsAdmin::Support::Datetime.to_momentjs(strftime_format)
+          end
+
           register_instance_option :datepicker_options do
             {
               showTodayButton: true,
-              format: parser.to_momentjs,
+              format: momentjs_format,
             }
           end
 
@@ -61,6 +52,10 @@ def value
             true
           end
 
+          register_instance_option :queryable? do
+            false
+          end
+
           register_instance_option :formatted_value do
             if time = (value || default_value)
               ::I18n.l(time, format: strftime_format)
@@ -72,6 +67,10 @@ def value
           register_instance_option :partial do
             :form_datetime
           end
+
+          def form_value
+            value&.in_time_zone&.strftime('%FT%T') || form_default_value
+          end
         end
       end
     end

lib/rails_admin/config/fields/types/time.rb

@@ -8,10 +8,7 @@ class Time < RailsAdmin::Config::Fields::Types::Datetime
           RailsAdmin::Config::Fields::Types.register(self)
 
           def parse_value(value)
-            parent_value = super(value)
-            return unless parent_value
-            value_with_tz = parent_value.in_time_zone
-            ::DateTime.parse(value_with_tz.strftime('%Y-%m-%d %H:%M:%S'))
+            abstract_model.model.type_for_attribute(name.to_s).serialize(super)&.change(year: 2000, month: 1, day: 1)
           end
 
           register_instance_option :strftime_format do

lib/rails_admin/config/fields/types/timestamp.rb

@@ -7,10 +7,6 @@ module Types
         class Timestamp < RailsAdmin::Config::Fields::Types::Datetime
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
-
-          @format = :long
-          @i18n_scope = [:time, :formats]
-          @js_plugin_options = {}
         end
       end
     end