diff --git a/app/controllers/rails_admin/main_controller.rb b/app/controllers/rails_admin/main_controller.rb index 50851fcd4b..053f71565d 100644 --- a/app/controllers/rails_admin/main_controller.rb +++ b/app/controllers/rails_admin/main_controller.rb @@ -40,7 +40,7 @@ def list_entries(model_config = @model_config, auth_scope_key = :index, addition end private - + def get_layout "rails_admin/#{request.headers['X-PJAX'] ? 'pjax' : 'application'}" end diff --git a/lib/rails_admin/adapters/mongoid.rb b/lib/rails_admin/adapters/mongoid.rb index 215dc8fe0d..f28a448f2d 100644 --- a/lib/rails_admin/adapters/mongoid.rb +++ b/lib/rails_admin/adapters/mongoid.rb @@ -237,7 +237,7 @@ def build_statement(column, type, value, operator) return if value.blank? value = case operator when 'default', 'like' - Regexp.compile(Regexp.escape(value)) + Regexp.compile(Regexp.escape(value), Regexp::IGNORECASE) when 'starts_with' Regexp.compile("^#{Regexp.escape(value)}") when 'ends_with' diff --git a/spec/unit/adapters/mongoid_spec.rb b/spec/unit/adapters/mongoid_spec.rb index 189dfe9ef5..52ced72227 100644 --- a/spec/unit/adapters/mongoid_spec.rb +++ b/spec/unit/adapters/mongoid_spec.rb @@ -686,10 +686,10 @@ class CustomValiated it "supports string type query" do @abstract_model.send(:build_statement, :field, :string, "", nil).should be_nil @abstract_model.send(:build_statement, :field, :string, "foo", "was").should be_nil - @abstract_model.send(:build_statement, :field, :string, "foo", "default").should == {:field=>/foo/} - @abstract_model.send(:build_statement, :field, :string, "foo", "like").should == {:field=>/foo/} - @abstract_model.send(:build_statement, :field, :string, "foo", "starts_with").should == {:field=>/^foo/} - @abstract_model.send(:build_statement, :field, :string, "foo", "ends_with").should == {:field=>/foo$/} + @abstract_model.send(:build_statement, :field, :string, "foo", "default").should == {:field=>/foo/i} + @abstract_model.send(:build_statement, :field, :string, "foo", "like").should == {:field=>/foo/i} + @abstract_model.send(:build_statement, :field, :string, "foo", "starts_with").should == {:field=>/^foo/i} + @abstract_model.send(:build_statement, :field, :string, "foo", "ends_with").should == {:field=>/foo$/i} @abstract_model.send(:build_statement, :field, :string, "foo", "is").should == {:field=>'foo'} end