rails_admin 2.0.0.rc → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b0f4ab7caf68837692964e8e69e90d167282dafa55a35aaaa3d76eb93f97b9d
-  data.tar.gz: 9a6407f79b492dffafd49568675b7982122c76e080519c0f6b3156abbeb3e71a
+  metadata.gz: e91bcbfc9a80b1718903e12a7a806f295115aab1917a5613632a9ee50a9b7973
+  data.tar.gz: 278d75adfbb87dbfc1751f9c510eba68a13809873fce08dc6ed6e53355f0b9c8
 SHA512:
-  metadata.gz: 127e444d5dee93ccb6cd28c210368bc143d06732f5683917b0b969eac3717a3a606d5415891d5e768385cc3fd445ce2d754c39f97daec21b50ee49595a5ecde2
-  data.tar.gz: 14ff533ab2205b78c5d3529bd0b16166af4b2ad54547c6c67d20ffde399ed17defe559dc53c7e34a3c3457ef16bf4de8b4122211c6ea663090946ca84e687380
+  metadata.gz: 7a8fefb5416435b1e0a7622f6c6fc547b356b8d9e33fc30ea715030a33f4957952a587830a68565c574e50c1b3f6c98327a039accf75389a6d053a03c884be84
+  data.tar.gz: 85258795ff168eff5d247eb77cec0a8fd1b630e830eb17b8144914592e3d3fd50808c924248cca101c13a8a21683e75eb5a6407b768d3580bd04daef412b339f

data/Gemfile

@@ -8,7 +8,7 @@ gem 'devise'
 group :active_record do
   gem 'paper_trail'
 
-  platforms :ruby, :mswin, :mingw do
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
     gem 'mysql2', '>= 0.3.14'
     gem 'sqlite3', '>= 1.3'
   end
@@ -19,29 +19,32 @@ group :development, :test do
 end
 
 group :test do
+  gem 'cancancan', '~> 3.0'
   gem 'carrierwave', ['>= 2.0.0.rc', '< 3']
-  gem 'coveralls'
-  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0']
+  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0', '< 2.0']
   gem 'dragonfly', '~> 1.0'
   gem 'factory_bot', '>= 4.2'
   gem 'generator_spec', '>= 0.8'
   gem 'launchy', '>= 2.2'
   gem 'mini_magick', '>= 3.4'
-  gem 'paperclip', ['>= 3.4', '!= 4.3.0']
   gem 'poltergeist', '~> 1.5'
   gem 'pundit'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'
   gem 'rspec-expectations', '!= 3.8.3'
-  gem 'rubocop', '~> 0.41.2'
+  gem 'rspec-retry'
+  gem 'rubocop', '~> 0.68.1', require: false
+  gem 'rubocop-performance', require: false
   gem 'simplecov', '>= 0.9', require: false
-  gem 'shrine', '~> 2.0'
-  gem 'shrine-memory'
+  gem 'simplecov-lcov', require: false
   gem 'timecop', '>= 0.5'
 
   platforms :ruby_19 do
     gem 'tins', '~> 1.6.0', require: false
   end
+
+  # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+  gem 'tzinfo-data', platforms: %i(mingw mswin x64_mingw jruby)
 end
 
 gemspec

data/README.md

@@ -1,14 +1,14 @@
 # RailsAdmin
 
 [![Gem Version](https://img.shields.io/gem/v/rails_admin.svg)][gem]
-[![Build Status](https://img.shields.io/travis/sferik/rails_admin.svg)][travis]
+[![Build Status](https://img.shields.io/github/workflow/status/sferik/rails_admin/Test)][ghactions]
 [![Coverage Status](https://img.shields.io/coveralls/sferik/rails_admin.svg)][coveralls]
 [![Inline docs](http://inch-ci.org/github/sferik/rails_admin.svg)][inch]
 [![Code Climate](https://codeclimate.com/github/sferik/rails_admin.svg)][codeclimate]
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver)][semver]
 
 [gem]: https://rubygems.org/gems/rails_admin
-[travis]: https://travis-ci.org/sferik/rails_admin
+[ghactions]: https://github.com/sferik/rails_admin/actions
 [coveralls]: https://coveralls.io/r/sferik/rails_admin
 [inch]: http://inch-ci.org/github/sferik/rails_admin
 [codeclimate]: https://codeclimate.com/github/sferik/rails_admin
@@ -20,9 +20,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ### [Action required] Security issue
 
-> **RailsAdmin prior to 1.3.0 have been reported to have XSS vulnerability.** We strongly recommend that you upgrade RailsAdmin to 1.3.0 or later as soon as possible, if you are on those versions. See [#2985](https://github.com/sferik/rails_admin/issues/2985) for the detail.
-> 
-> Also, 1.0.0 and 1.1.0 is known to have [CSRF vulnerability](https://github.com/sferik/rails_admin/commit/b13e879eb93b661204e9fb5e55f7afa4f397537a), too.
+**RailsAdmin 2.0.1, 2.0.0 and up to 1.4.2 have been reported to have XSS vulnerability.** We strongly recommend that you upgrade RailsAdmin to 2.0.2 (and higher) or 1.4.3 as soon as possible, if you are on those versions. See [d72090ec](https://github.com/sferik/rails_admin/commit/d72090ec6a07c3b9b7b48ab50f3d405f91ff4375) for the detail.
 
 ## Getting started
 
@@ -50,7 +48,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', '~> 2.0.0.rc'`
+1. On your gemfile: `gem 'rails_admin', '~> 2.0'`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked
@@ -94,13 +92,15 @@ list][list].
 If you think you found a bug in RailsAdmin, you can [submit an issue](https://github.com/sferik/rails_admin/issues/new).
 
 ## Supported Ruby Versions
-This library aims to support and is [tested against][travis] the following Ruby implementations:
+This library aims to support and is [tested against][ghactions] the following Ruby implementations:
 
 * Ruby 2.2
 * Ruby 2.3
 * Ruby 2.4
 * Ruby 2.5
 * Ruby 2.6
+* Ruby 2.7
+* Ruby 3.0
 * [JRuby][]
 
 [jruby]: http://jruby.org/

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

@@ -11,6 +11,7 @@
       var field_value = options['value'];
       var field_operator = options['operator'];
       var select_options = options['select_options'];
+      var required = options['required'];
       var index = options['index'];
       var value_name    = 'f[' +  field_name + '][' + index + '][v]';
       var operator_name = 'f[' +  field_name + '][' + index + '][o]';
@@ -24,9 +25,13 @@
             .append('<option value="_discard">...</option>')
             .append($('<option value="true"></option>').prop('selected', field_value == "true").text(RailsAdmin.I18n.t("true")))
             .append($('<option value="false"></option>').prop('selected', field_value == "false").text(RailsAdmin.I18n.t("false")))
-            .append('<option disabled="disabled">---------</option>')
-            .append($('<option value="_present"></option>').prop('selected', field_value == "_present").text(RailsAdmin.I18n.t("is_present")))
-            .append($('<option value="_blank"></option>').prop('selected', field_value == "_blank").text(RailsAdmin.I18n.t("is_blank")));
+            if (!required) {
+              control.append([
+                '<option disabled="disabled">---------</option>',
+                $('<option value="_present"></option>').prop('selected', field_value == "_present").text(RailsAdmin.I18n.t("is_present")),
+                $('<option value="_blank"></option>').prop('selected', field_value == "_blank").text(RailsAdmin.I18n.t("is_blank"))
+              ])
+            }
           break;
         case 'date':
           additional_control =
@@ -56,9 +61,13 @@
             .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")))
-            .append('<option disabled="disabled">---------</option>')
-            .append($('<option value="_not_null"></option>').prop('selected', field_operator == "_not_null").text(RailsAdmin.I18n.t("is_present")))
-            .append($('<option value="_null"></option>').prop('selected', field_operator == "_null").text(RailsAdmin.I18n.t("is_blank")));
+          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')
@@ -84,10 +93,14 @@
             .prop('name', multiple_values ? undefined : value_name)
             .data('name', value_name)
             .append('<option value="_discard">...</option>')
-            .append($('<option value="_present"></option>').prop('selected', field_value == "_present").text(RailsAdmin.I18n.t("is_present")))
-            .append($('<option value="_blank"></option>').prop('selected', field_value == "_blank").text(RailsAdmin.I18n.t("is_blank")))
-            .append('<option disabled="disabled">---------</option>')
-            .append(select_options)
+          if (!required) {
+            control.append([
+              $('<option value="_present"></option>').prop('selected', field_value == "_present").text(RailsAdmin.I18n.t("is_present")),
+              $('<option value="_blank"></option>').prop('selected', field_value == "_blank").text(RailsAdmin.I18n.t("is_blank")),
+              '<option disabled="disabled">---------</option>'
+            ])
+          }
+          control.append(select_options)
             .add(
               $('<select multiple="multiple" class="select-multiple input-sm form-control"></select>')
               .css('display', multiple_values ? 'inline-block' : 'none')
@@ -111,9 +124,13 @@
             .append($('<option data-additional-fieldset="additional-fieldset" value="is"></option>').prop('selected', field_operator == "is").text(RailsAdmin.I18n.t("is_exactly")))
             .append($('<option data-additional-fieldset="additional-fieldset" value="starts_with"></option>').prop('selected', field_operator == "starts_with").text(RailsAdmin.I18n.t("starts_with")))
             .append($('<option data-additional-fieldset="additional-fieldset" value="ends_with"></option>').prop('selected', field_operator == "ends_with").text(RailsAdmin.I18n.t("ends_with")))
-            .append('<option disabled="disabled">---------</option>')
-            .append($('<option value="_present"></option>').prop('selected', field_operator == "_present").text(RailsAdmin.I18n.t("is_present")))
-            .append($('<option value="_blank"></option>').prop('selected', field_operator == "_blank").text(RailsAdmin.I18n.t("is_blank")));
+          if (!required) {
+            control.append([
+              '<option disabled="disabled">---------</option>',
+              $('<option value="_present"></option>').prop('selected', field_operator == "_present").text(RailsAdmin.I18n.t("is_present")),
+              $('<option value="_blank"></option>').prop('selected', field_operator == "_blank").text(RailsAdmin.I18n.t("is_blank"))
+            ])
+          }
           additional_control = $('<input class="additional-fieldset input-sm form-control" type="text" />')
             .css('display', field_operator == "_present" || field_operator == "_blank" ? 'none' : 'inline-block')
             .prop('name', value_name)
@@ -126,9 +143,13 @@
             .prop('name', operator_name)
             .append($('<option data-additional-fieldset="default" value="default"></option>').prop('selected', field_operator == "default").text(RailsAdmin.I18n.t("number")))
             .append($('<option data-additional-fieldset="between" value="between"></option>').prop('selected', field_operator == "between").text(RailsAdmin.I18n.t("between_and_")))
-            .append('<option disabled="disabled">---------</option>')
-            .append($('<option value="_not_null"></option>').prop('selected', field_operator == "_not_null").text(RailsAdmin.I18n.t("is_present")))
-            .append($('<option value="_null"></option>').prop('selected', field_operator == "_null").text(RailsAdmin.I18n.t("is_blank")));
+          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 =
             $('<input class="additional-fieldset default input-sm form-control" type="text" />')
             .css('display', (!field_operator || field_operator == "default") ? 'inline-block' : 'none')
@@ -193,6 +214,7 @@
       value: $(this).data('field-value'),
       operator: $(this).data('field-operator'),
       select_options: $(this).data('field-options'),
+      required: $(this).data('field-required'),
       index: $.now().toString().slice(6,11),
       datetimepicker_format: $(this).data('field-datetimepicker-format')
     });

data/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js

@@ -19,13 +19,13 @@
       sortable: false,
       removable: true,
       regional: {
-        up: "Up",
-        down: "Down",
-        add: "Add",
-        chooseAll: "Choose all",
-        chosen: "Chosen records",
-        clearAll: "Clear all",
-        remove: "Remove"
+        add: 'Add',
+        chooseAll: 'Choose all',
+        clearAll: 'Clear all',
+        down: 'Down',
+        remove: 'Remove',
+        search: 'Search',
+        up: 'Up'
       },
       searchDelay: 400,
       remote_source: null,

data/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js

@@ -11,7 +11,9 @@
   $(document).on('nested:fieldAdded', 'form', function(content) {
     var controls, field, nav, new_tab, one_to_one, parent_group, toggler;
     field = content.field.addClass('tab-pane').attr('id', 'unique-id-' + (new Date().getTime()));
-    new_tab = $('<li><a data-toggle="tab" href="#' + field.attr('id') + '">' + field.children('.object-infos').data('object-label') + '</a></li>');
+    new_tab = $('<li></li>').append(
+        $('<a></a>').attr('data-toggle', 'tab').attr('href', '#' + field.attr('id')).text(field.children('.object-infos').data('object-label'))
+    )
     parent_group = field.closest('.control-group');
     controls = parent_group.children('.controls');
     one_to_one = controls.data('nestedone') !== void 0;
@@ -27,7 +29,7 @@
     content.select(':hidden').show('slow');
     toggler.addClass('active').removeClass('disabled').children('i').addClass('icon-chevron-down').removeClass('icon-chevron-right');
     if (one_to_one) {
-      controls.find('.add_nested_fields').removeClass('add_nested_fields').html(field.children('.object-infos').data('object-label'));
+      controls.find('.add_nested_fields').removeClass('add_nested_fields').text(field.children('.object-infos').data('object-label'));
     }
   });
 

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

@@ -137,7 +137,11 @@
         toggler = field.find('> .controls > .btn-group > .toggler');
         tab_content.children('.fields:not(.tab-pane)').addClass('tab-pane').each(function() {
           $(this).attr('id', 'unique-id-' + (new Date().getTime()) + Math.floor(Math.random() * 100000));
-          nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>');
+          nav.append(
+              $('<li></li>').append(
+                  $('<a></a>').attr('data-toggle', 'tab').attr('href', '#' + this.id).text($(this).children('.object-infos').data('object-label'))
+              )
+          );
         });
         if (nav.find("> li.active").length === 0) {
           nav.find("> li > a[data-toggle='tab']:first").tab('show');
@@ -165,8 +169,12 @@
         tab_content = field.find("> .tab-content");
         toggler = field.find('> .controls > .btn-group > .toggler');
         tab_content.children(".fields:not(.tab-pane)").addClass('tab-pane active').each(function() {
-          field.find('> .controls .add_nested_fields').removeClass('add_nested_fields').html($(this).children('.object-infos').data('object-label'));
-          nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>');
+          field.find('> .controls .add_nested_fields').removeClass('add_nested_fields').text($(this).children('.object-infos').data('object-label'));
+          nav.append(
+              $('<li></li>').append(
+                  $('<a></a>').attr('data-toggle', 'tab').attr('href', '#' + this.id).text($(this).children('.object-infos').data('object-label'))
+              )
+          );
         });
         first_tab = nav.find("> li > a[data-toggle='tab']:first");
         first_tab.tab('show');

data/app/controllers/rails_admin/application_controller.rb

@@ -11,6 +11,8 @@ module RailsAdmin
   end
 
   class ApplicationController < Config.parent_controller.constantize
+    include RailsAdmin::Extensions::ControllerExtension
+
     protect_from_forgery(Config.forgery_protection_settings)
 
     before_action :_authenticate!

data/app/helpers/rails_admin/application_helper.rb

@@ -125,7 +125,7 @@ module RailsAdmin
     def breadcrumb(action = @action, _acc = [])
       begin
         (parent_actions ||= []) << action
-      end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent)) # rubocop:disable Loop
+      end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent)) # rubocop:disable Lint/Loop
 
       content_tag(:ol, class: 'breadcrumb') do
         parent_actions.collect do |a|

data/app/helpers/rails_admin/form_builder.rb

@@ -38,16 +38,15 @@ module RailsAdmin
     end
 
     def field_wrapper_for(field, nested_in)
-      if field.label
-        # do not show nested field if the target is the origin
-        unless nested_field_association?(field, nested_in)
-          @template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
-            label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
-              (field.nested_form ? field_for(field) : input_for(field))
-          end
+      # do not show nested field if the target is the origin
+      return if nested_field_association?(field, nested_in)
+      @template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
+        if field.label
+          label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
+            (field.nested_form ? field_for(field) : input_for(field))
+        else
+          field.nested_form ? field_for(field) : input_for(field)
         end
-      else
-        field.nested_form ? field_for(field) : input_for(field)
       end
     end
 

data/app/helpers/rails_admin/main_helper.rb

@@ -76,7 +76,8 @@ module RailsAdmin
         options[:type]  = field.type
         options[:value] = filter_hash['v']
         options[:label] = field.label
-        options[:operator] = filter_hash['o']
+        options[:operator] = filter_hash['o'] || field.default_filter_operator
+        options[:required] = field.required
         options
       end if ordered_filters
     end

data/app/views/rails_admin/main/_form_enumeration.html.haml

@@ -7,12 +7,13 @@
       sortable: false,
       cacheAll: true,
       regional: {
+        add: t("admin.misc.add_new"),
         chooseAll: t("admin.misc.chose_all"),
-        chosen: t("admin.misc.chosen", name: config.label_plural),
         clearAll: t("admin.misc.clear_all"),
+        down: t("admin.misc.down"),
+        remove: t("admin.misc.remove"),
         search: t("admin.misc.search"),
-        up: t("admin.misc.up"),
-        down: t("admin.misc.down")
+        up: t("admin.misc.up")
       }
     }
   = form.select field.method_name, field.enum, { selected: field.form_value, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true})

data/app/views/rails_admin/main/_form_filtering_multiselect.html.haml

@@ -29,12 +29,13 @@
     removable: !!field.removable,
     cacheAll: !!field.associated_collection_cache_all,
     regional: {
-      chooseAll: t("admin.misc.chose_all"),
-      chosen: t("admin.misc.chosen", name: config.label_plural),
-      clearAll: t("admin.misc.clear_all"),
-      search: t("admin.misc.search"),
-      up: t("admin.misc.up"),
-      down: t("admin.misc.down")
+      add: t('admin.misc.add_new'),
+      chooseAll: t('admin.misc.chose_all'),
+      clearAll: t('admin.misc.clear_all'),
+      down: t('admin.misc.down'),
+      remove: t('admin.misc.remove'),
+      search: t('admin.misc.search'),
+      up: t('admin.misc.up')
     }
   }
 

data/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-options" => field_options.html_safe, :"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(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
 
 %style
   - properties.select{ |p| p.column_width.present? }.each do |property|
@@ -53,7 +53,7 @@
           %button.btn.btn-primary{type: 'submit', :'data-disable-with' => '<i class="icon-white icon-refresh"></i> '.html_safe + t('admin.misc.refresh')}
             %i.icon-white.icon-refresh
             = t('admin.misc.refresh')
-          %button#remove_filter.btn.btn-info{title: "Reset filters"}
+          %button#remove_filter.btn.btn-info{title: t('admin.misc.reset_filters')}
             %i.icon-white.icon-remove
       - if export_action
         %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'

data/app/views/rails_admin/main/show.html.haml

@@ -1,6 +1,6 @@
 - @model_config.show.with(object: @object, view: self, controller: self.controller).visible_groups.each do |fieldset|
   - unless (fields = fieldset.with(object: @object, view: self, controller: self.controller).visible_fields).empty?
-    - unless (fields = fields.reject{ |f| RailsAdmin::config.compact_show_view && f.formatted_value.nil? || f.formatted_value == '' }).empty?
+    - unless (fields = fields.reject{ |f| RailsAdmin::config.compact_show_view && (f.formatted_value.nil? || f.formatted_value == '') }).empty?
       .fieldset
         %h4
           = fieldset.label

data/config/locales/rails_admin.en.yml

@@ -29,13 +29,13 @@ en:
     misc:
       search: "Search"
       filter: "Filter"
+      reset_filters: "Reset filters"
       refresh: "Refresh"
       show_all: "Show all"
       add_filter: "Add filter"
       bulk_menu_title: "Selected items"
       remove: "Remove"
       add_new: "Add new"
-      chosen: "Chosen %{name}"
       chose_all: "Choose all"
       clear_all: "Clear all"
       up: "Up"
@@ -45,6 +45,7 @@ en:
       navigation_static_label: "Links"
       log_out: "Log out"
       time_ago: "%{time} ago"
+      ago: "ago"
       more: "Plus %{count} more %{models_name}"
     flash:
       successful: "%{name} successfully %{action}"

data/lib/rails_admin/abstract_model.rb

@@ -178,8 +178,8 @@ module RailsAdmin
 
       def build_statement_for_datetime_or_timestamp
         start_date, end_date = get_filtering_duration
-        start_date = start_date.to_time.try(:beginning_of_day) if start_date
-        end_date = end_date.to_time.try(:end_of_day) if end_date
+        start_date = start_date.try(:beginning_of_day) if start_date
+        end_date = end_date.try(:end_of_day) if end_date
         range_filter(start_date, end_date)
       end
 

data/lib/rails_admin/adapters/active_record.rb

@@ -71,11 +71,17 @@ module RailsAdmin
       delegate :primary_key, :table_name, to: :model, prefix: false
 
       def encoding
-        case ::ActiveRecord::Base.connection_config[:adapter]
+        adapter =
+          if ::ActiveRecord::Base.respond_to?(:connection_db_config)
+            ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
+          else
+            ::ActiveRecord::Base.connection_config[:adapter]
+          end
+        case adapter
         when 'postgresql'
           ::ActiveRecord::Base.connection.select_one("SELECT ''::text AS str;").values.first.encoding
         when 'mysql2'
-          ::ActiveRecord::Base.connection.instance_variable_get(:@connection).encoding
+          ::ActiveRecord::Base.connection.raw_connection.encoding
         when 'oracle_enhanced'
           ::ActiveRecord::Base.connection.select_one("SELECT dummy FROM DUAL").values.first.encoding
         else
@@ -144,7 +150,7 @@ module RailsAdmin
             field = fields.detect { |f| f.name.to_s == field_name }
             value = parse_field_value(field, filter_dump[:v])
 
-            wb.add(field, value, (filter_dump[:o] || 'default'))
+            wb.add(field, value, (filter_dump[:o] || RailsAdmin::Config.default_search_operator))
             # AND current filter statements to other filter statements
             scope = wb.build
           end