rails_admin 1.2.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c69e517eca7e9a2fd7b5f93c966f86f9eadd57d5
-  data.tar.gz: c2df6d3bcda5e4ccd0cadef10ddc46a4e8f6c283
+SHA256:
+  metadata.gz: e91bcbfc9a80b1718903e12a7a806f295115aab1917a5613632a9ee50a9b7973
+  data.tar.gz: 278d75adfbb87dbfc1751f9c510eba68a13809873fce08dc6ed6e53355f0b9c8
 SHA512:
-  metadata.gz: e6fc0cb49d89c389de0afffdc0e17215d6e9d6a702ef8c263106058ed1f4a5bdd13e0d57ce9d39cc691a88de83669bfaeaaeb21c9657aaa096f2e387091b125e
-  data.tar.gz: fafcc0bb5ada22245b595107ee6c65c2b816de55d48d969e9ca4c225e428118ba4d4b8e5af6a4a2138e4c5b52a100fb1673970e31b0e087cc73d15d5da97d030
+  metadata.gz: 7a8fefb5416435b1e0a7622f6c6fc547b356b8d9e33fc30ea715030a33f4957952a587830a68565c574e50c1b3f6c98327a039accf75389a6d053a03c884be84
+  data.tar.gz: 85258795ff168eff5d247eb77cec0a8fd1b630e830eb17b8144914592e3d3fd50808c924248cca101c13a8a21683e75eb5a6407b768d3580bd04daef412b339f

data/Gemfile

@@ -1,14 +1,15 @@
 source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
-gem 'rails', '~> 5.0.0'
+gem 'rails'
 gem 'haml'
 gem 'devise'
 
 group :active_record do
-  platforms :ruby, :mswin, :mingw do
-    gem 'mysql2', '~> 0.3.14'
-    gem 'pg', '>= 0.14'
+  gem 'paper_trail'
+
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
+    gem 'mysql2', '>= 0.3.14'
     gem 'sqlite3', '>= 1.3'
   end
 end
@@ -18,28 +19,32 @@ group :development, :test do
 end
 
 group :test do
-  gem 'cancan', '>= 1.6'
-  gem 'cancancan', '~> 1.12.0'
-  gem 'carrierwave', '>= 0.8'
-  gem 'coveralls'
-  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0']
+  gem 'cancancan', '~> 3.0'
+  gem 'carrierwave', ['>= 2.0.0.rc', '< 3']
+  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0', '< 2.0']
   gem 'dragonfly', '~> 1.0'
-  gem 'factory_girl', '>= 4.2'
+  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 'rubocop', '~> 0.41.2'
+  gem 'rspec-expectations', '!= 3.8.3'
+  gem 'rspec-retry'
+  gem 'rubocop', '~> 0.68.1', require: false
+  gem 'rubocop-performance', require: false
   gem 'simplecov', '>= 0.9', require: false
+  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,18 +1,18 @@
 # 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]
-[![Dependency Status](https://img.shields.io/gemnasium/sferik/rails_admin.svg)][gemnasium]
-[![Code Climate](https://img.shields.io/codeclimate/github/sferik/rails_admin.svg)][codeclimate]
+[![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
-[gemnasium]: https://gemnasium.com/sferik/rails_admin
-[codeclimate]: https://codeclimate.com/github/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
+[semver]: https://dependabot.com/compatibility-score.html?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver
 
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
@@ -20,10 +20,16 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ### [Action required] Security issue
 
-**RailsAdmin 1.0.0 and 1.1.0 have been reported to have CSRF vulnerability with default setup.** We strongly recommend that you upgrade RailsAdmin to 1.1.1 or later as soon as possible, if you are on these versions. See [b13e879e](https://github.com/sferik/rails_admin/commit/b13e879eb93b661204e9fb5e55f7afa4f397537a) for the detail.
+**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
 
-This problem was reported by SourceClear, Inc.
+* Check out [the docs][docs].
+* Try the [live demo][demo]. ([Source code][dummy_app])
 
+[demo]: http://rails-admin-tb.herokuapp.com/
+[dummy_app]: https://github.com/bbenezech/dummy_app
+[docs]: https://github.com/sferik/rails_admin/wiki
 
 ## Features
 * CRUD any data with ease
@@ -42,7 +48,7 @@ This problem was reported by SourceClear, Inc.
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', '~> 1.2'`
+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
@@ -50,7 +56,7 @@ This problem was reported by SourceClear, Inc.
 
 ## Configuration
 ### Global
-In `config/initializers/rails_admin`:
+In `config/initializers/rails_admin.rb`:
 
 [Details](https://github.com/sferik/rails_admin/wiki/Base-configuration)
 
@@ -72,15 +78,6 @@ end
 
 Details: [Models](https://github.com/sferik/rails_admin/wiki/Models), [Groups](https://github.com/sferik/rails_admin/wiki/Groups), [Fields](https://github.com/sferik/rails_admin/wiki/Fields)
 
-## Documentation
-https://github.com/sferik/rails_admin/wiki
-
-## Demo
-Take RailsAdmin for a [test drive][demo] with sample data. ([Source code.][dummy_app])
-
-[demo]: http://rails-admin-tb.herokuapp.com/
-[dummy_app]: https://github.com/bbenezech/dummy_app
-
 ## Support
 If you have a question, please check this README, the wiki, and the [list of
 known issues][troubleshoot].
@@ -95,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.1
 * Ruby 2.2
 * Ruby 2.3
-* [Rubinius][]
+* Ruby 2.4
+* Ruby 2.5
+* Ruby 2.6
+* Ruby 2.7
+* Ruby 3.0
 * [JRuby][]
 
-[rubinius]: http://rubinius.com
 [jruby]: http://jruby.org/

data/app/assets/javascripts/rails_admin/custom/ui.js

@@ -0,0 +1 @@
+// override this file in your application to add custom behaviour

data/app/assets/javascripts/rails_admin/jquery-ui.js.erb

@@ -0,0 +1,8 @@
+<% require_asset "jquery-ui/effect" %>
+<% if Jquery::Ui::Rails::JQUERY_UI_VERSION >= '1.12' %>
+  <% require_asset "jquery-ui/widgets/sortable" %>
+  <% require_asset "jquery-ui/widgets/autocomplete" %>
+<% else %>
+  <% require_asset "jquery-ui/sortable" %>
+  <% require_asset "jquery-ui/autocomplete" %>
+<% end %>

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]';
@@ -19,90 +20,178 @@
 
       switch(field_type) {
         case 'boolean':
-          var control = '<select class="input-sm form-control" name="' + value_name + '">' +
-            '<option value="_discard">...</option>' +
-            '<option value="true"' + (field_value == "true" ? 'selected="selected"' : '') + '>' + RailsAdmin.I18n.t("true") + '</option>' +
-            '<option value="false"' + (field_value == "false" ? 'selected="selected"' : '') + '>' + RailsAdmin.I18n.t("false") + '</option>' +
-            '<option disabled="disabled">---------</option>' +
-            '<option ' + (field_value == "_present" ? 'selected="selected"' : '') + ' value="_present">' + RailsAdmin.I18n.t("is_present") + '</option>' +
-            '<option ' + (field_value == "_blank"   ? 'selected="selected"' : '') + ' value="_blank"  >' + RailsAdmin.I18n.t("is_blank") + '</option>' +
-          '</select>';
+          control = $('<select class="input-sm form-control"></select>')
+            .prop('name', value_name)
+            .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")))
+            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 =
-          '<input size="20" class="date additional-fieldset default input-sm form-control" style="display:' + ((!field_operator || field_operator == "default") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[0] || '') + '" /> ' +
-          '<input size="20" placeholder="-∞" class="date additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[1] || '') + '" /> ' +
-          '<input size="20" placeholder="∞" class="date additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[2] || '') + '" />';
+            $('<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':
-          control = control || '<select class="switch-additionnal-fieldsets input-sm form-control" name="' + operator_name + '">' +
-            '<option ' + (field_operator == "default"   ? 'selected="selected"' : '') + ' data-additional-fieldset="default" value="default">' + RailsAdmin.I18n.t("date") + '</option>' +
-            '<option ' + (field_operator == "between"   ? 'selected="selected"' : '') + ' data-additional-fieldset="between" value="between">' + RailsAdmin.I18n.t("between_and_") + '</option>' +
-            '<option ' + (field_operator == "today"   ? 'selected="selected"' : '') + ' value="today">' + RailsAdmin.I18n.t("today") + '</option>' +
-            '<option ' + (field_operator == "yesterday"   ? 'selected="selected"' : '') + ' value="yesterday">' + RailsAdmin.I18n.t("yesterday") + '</option>' +
-            '<option ' + (field_operator == "this_week"   ? 'selected="selected"' : '') + ' value="this_week">' + RailsAdmin.I18n.t("this_week") + '</option>' +
-            '<option ' + (field_operator == "last_week"   ? 'selected="selected"' : '') + ' value="last_week">' + RailsAdmin.I18n.t("last_week") + '</option>' +
-            '<option disabled="disabled">---------</option>' +
-            '<option ' + (field_operator == "_not_null" ? 'selected="selected"' : '') + ' value="_not_null">' + RailsAdmin.I18n.t("is_present") + '</option>' +
-            '<option ' + (field_operator == "_null"     ? 'selected="selected"' : '') + ' value="_null" >' + RailsAdmin.I18n.t("is_blank") + '</option>' +
-          '</select>'
+          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="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 (!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" style="display:' + ((!field_operator || field_operator == "default") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[0] || '') + '" /> ' +
-          '<input size="25" placeholder="-∞" class="datetime additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[1] || '') + '" /> ' +
-          '<input size="25" placeholder="∞" class="datetime additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[2] || '') + '" />';
+            $('<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] || '')
+            );
           break;
         case 'enum':
           var multiple_values = ((field_value instanceof Array) ? true : false)
-          control = '<select style="display:' + (multiple_values ? 'none' : 'inline-block') + '" ' + (multiple_values ? '' : 'name="' + value_name + '"') + ' data-name="' + value_name + '" class="select-single input-sm form-control">' +
-              '<option value="_discard">...</option>' +
-              '<option ' + (field_value == "_present" ? 'selected="selected"' : '') + ' value="_present">' + RailsAdmin.I18n.t("is_present") + '</option>' +
-              '<option ' + (field_value == "_blank"   ? 'selected="selected"' : '') + ' value="_blank">' + RailsAdmin.I18n.t("is_blank") + '</option>' +
-              '<option disabled="disabled">---------</option>' +
-              select_options +
-            '</select>' +
-            '<select multiple="multiple" style="display:' + (multiple_values ? 'inline-block' : 'none') + '" ' + (multiple_values ? 'name="' + value_name + '[]"' : '') + ' data-name="' + value_name + '[]" class="select-multiple input-sm form-control">' +
-              select_options +
-            '</select> ' +
-            '<a href="#" class="switch-select"><i class="icon-' + (multiple_values ? 'minus' : 'plus') + '"></i></a>';
+          control = $('<select class="select-single input-sm form-control"></select>')
+            .css('display', multiple_values ? 'none' : 'inline-block')
+            .prop('name', multiple_values ? undefined : value_name)
+            .data('name', value_name)
+            .append('<option value="_discard">...</option>')
+          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')
+              .prop('name', multiple_values ? value_name + '[]' : undefined)
+              .data('name', value_name + '[]')
+              .append(select_options)
+            )
+            .add(
+              $('<a href="#" class="switch-select"></a>')
+              .append($('<i></i>').addClass('icon-' + (multiple_values ? 'minus' : 'plus')))
+            );
         break;
         case 'string':
         case 'text':
         case 'belongs_to_association':
-          control = '<select class="switch-additionnal-fieldsets input-sm form-control" value="' + field_operator + '" name="' + operator_name + '">' +
-            '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "like"        ? 'selected="selected"' : '') + ' value="like">' + RailsAdmin.I18n.t("contains") + '</option>' +
-            '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "is"          ? 'selected="selected"' : '') + ' value="is">' + RailsAdmin.I18n.t("is_exactly") + '</option>' +
-            '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "starts_with" ? 'selected="selected"' : '') + ' value="starts_with">' + RailsAdmin.I18n.t("starts_with") + '</option>' +
-            '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "ends_with"   ? 'selected="selected"' : '') + ' value="ends_with">' + RailsAdmin.I18n.t("ends_with") + '</option>' +
-            '<option disabled="disabled">---------</option>' +
-            '<option ' + (field_operator == "_not_null"    ? 'selected="selected"' : '') + ' value="_not_null">' + RailsAdmin.I18n.t("is_present") + '</option>' +
-            '<option ' + (field_operator == "_null"      ? 'selected="selected"' : '') + ' value="_null">' + RailsAdmin.I18n.t("is_blank") + '</option>' +
-          '</select>'
-          additional_control = '<input class="additional-fieldset input-sm form-control" style="display:' + (field_operator == "_blank" || field_operator == "_present" ? 'none' : 'inline-block') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
+          control = $('<select class="switch-additional-fieldsets input-sm form-control"></select>')
+            .prop('value', field_operator)
+            .prop('name', operator_name)
+            .append('<option value="_discard">...</option>')
+            .append($('<option data-additional-fieldset="additional-fieldset" value="like"></option>').prop('selected', field_operator == "like").text(RailsAdmin.I18n.t("contains")))
+            .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")))
+          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)
+            .prop('value', field_value);
           break;
         case 'integer':
         case 'decimal':
         case 'float':
-          control = '<select class="switch-additionnal-fieldsets input-sm form-control" name="' + operator_name + '">' +
-            '<option ' + (field_operator == "default"   ? 'selected="selected"' : '') + ' data-additional-fieldset="default" value="default">' + RailsAdmin.I18n.t("number") + '</option>' +
-            '<option ' + (field_operator == "between"   ? 'selected="selected"' : '') + ' data-additional-fieldset="between" value="between">' + RailsAdmin.I18n.t("between_and_") + '</option>' +
-            '<option disabled="disabled">---------</option>' +
-            '<option ' + (field_operator == "_not_null" ? 'selected="selected"' : '') + ' value="_not_null">' + RailsAdmin.I18n.t("is_present") +'</option>' +
-            '<option ' + (field_operator == "_null"     ? 'selected="selected"' : '') + ' value="_null" >' + RailsAdmin.I18n.t("is_blank") + '</option>' +
-          '</select>'
+          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("number")))
+            .append($('<option data-additional-fieldset="between" value="between"></option>').prop('selected', field_operator == "between").text(RailsAdmin.I18n.t("between_and_")))
+          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" style="display:' + ((!field_operator || field_operator == "default") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[0] || '') + '" /> ' +
-          '<input placeholder="-∞" class="additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[1] || '') + '" /> ' +
-          '<input placeholder="∞" class="additional-fieldset between input-sm form-control" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="' + field_type + '" name="' + value_name + '[]" value="' + (field_value[2] || '') + '" />';
+            $('<input class="additional-fieldset default input-sm form-control" type="text" />')
+            .css('display', (!field_operator || field_operator == "default") ? 'inline-block' : 'none')
+            .prop('type', field_type)
+            .prop('name', value_name + '[]')
+            .prop('value', field_value[0] || '')
+            .add(
+              $('<input placeholder="-∞" class="additional-fieldset between input-sm form-control" />')
+              .css('display', (field_operator == "between") ? 'inline-block' : 'none')
+              .prop('type', field_type)
+              .prop('name', value_name + '[]')
+              .prop('value', field_value[1] || '')
+            )
+            .add(
+              $('<input placeholder="∞" class="additional-fieldset between input-sm form-control" />')
+              .css('display', (field_operator == "between") ? 'inline-block' : 'none')
+              .prop('type', field_type)
+              .prop('name', value_name + '[]')
+              .prop('value', field_value[2] || '')
+            );
           break;
         default:
-          control = '<input type="text" class="input-sm form-control" name="' + value_name + '" value="' + field_value + '"/> ';
+          control = $('<input type="text" class="input-sm form-control" />')
+            .prop('name', value_name)
+            .prop('value', field_value);
           break;
       }
 
+      var filterContainerId = field_name + '-' + index + '-filter-container';
+      $('p#' + filterContainerId).remove();
+
       var $content = $('<p>')
+        .attr('id', filterContainerId)
         .addClass('filter form-search')
-        .append('<span class="label label-info form-label"><a href="#delete" class="delete"><i class="fa fa-trash-o fa-fw icon-white"></i>' + field_label + '</a></span>')
-        .append('&nbsp;' + control + '&nbsp;' + (additional_control || ''));
+        .append(
+          $('<span class="label label-info form-label"></span>')
+          .append($('<a href="#delete" class="delete"></a>').append('<i class="fa fa-trash-o fa-fw icon-white"></i>').append(document.createTextNode(field_label)))
+        )
+        .append('&nbsp;')
+        .append(control)
+        .append('&nbsp;')
+        .append(additional_control);
 
       $('#filters_box').append($content);
 
@@ -125,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')
     });
@@ -146,7 +236,7 @@
     $(this).find('i').toggleClass("icon-plus icon-minus")
   });
 
-  $(document).on('change', "#filters_box .switch-additionnal-fieldsets", function(e) {
+  $(document).on('change', "#filters_box .switch-additional-fieldsets", function(e) {
     var selected_option = $(this).find('option:selected');
     if(klass = $(selected_option).data('additional-fieldset')) {
       $(this).siblings('.additional-fieldset:not(.' + klass + ')').hide('slow');

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,
@@ -118,7 +118,7 @@
 
       /* Add all to selection */
       this.addAll.click(function(e){
-        widget._select($('option', widget.collection));
+        widget._select($('option:not(:disabled)', widget.collection));
         e.preventDefault();
         widget.selection.trigger('change');
       });
@@ -186,12 +186,13 @@
         }
         if (filtered.length > 0) {
           widget.collection[0].innerHTML = '';
-          var filteredContainer = [];
           for (i = 0; i < filtered.length; i++) {
-            var newOptions = '<option value="'+matches[filtered[i]].id+'" title="'+matches[filtered[i]].label+'">'+matches[filtered[i]].label+'</option>';
-            filteredContainer.push(newOptions);
+            var newOptions = $('<option></option>')
+              .prop('value', matches[filtered[i]].id)
+              .prop('title', matches[filtered[i]].label)
+              .text(matches[filtered[i]].label);
+            $(widget.collection[0]).append(newOptions);
           }
-          widget.collection[0].innerHTML = filteredContainer.join("");
         } else {
           widget.collection[0].innerHTML = widget.noObjectsPlaceholder;
         }
@@ -212,12 +213,11 @@
       var widget = this;
 
       this.element.find("option").each(function(i, option) {
+        widget._cache['o_' + option.value] = {id: option.value, value: $(option).text()};
         if (option.selected) {
-          widget._cache['o_' + option.value] = {id: option.value, value: option.innerHTML};
-          $(option).clone().appendTo(widget.selection).attr("selected", false).attr("title", $(option).text());
+          $(option).clone().appendTo(widget.selection).prop("selected", false).prop("title", $(option).text());
         } else {
-          widget._cache['o_' + option.value] = {id: option.value, value: option.innerHTML};
-          $(option).clone().appendTo(widget.collection).attr("selected", false).attr("title", $(option).text());
+          $(option).clone().appendTo(widget.collection).prop("selected", false).prop("title", $(option).text());
         }
       });
     },
@@ -227,7 +227,7 @@
       options.each(function(i, option) {
         widget.element.find('option[value="' + option.value + '"]').removeAttr("selected");
       });
-      $(options).appendTo(this.collection).attr('selected', false);
+      $(options).appendTo(this.collection).prop('selected', false);
     },
 
     _query: function(query, success) {
@@ -282,12 +282,12 @@
       options.each(function(i, option) {
         var el = widget.element.find('option[value="' + option.value + '"]');
         if (el.length) {
-          el.attr("selected", "selected");
+          el.prop("selected", true);
         } else {
-          widget.element.append($('<option></option>').attr('value', option.value).attr('selected', "selected"));
+          widget.element.append($('<option></option>').prop('value', option.value).prop('selected', true));
         }
       });
-      $(options).appendTo(this.selection).attr('selected', false);
+      $(options).appendTo(this.selection).prop('selected', false);
     },
 
     _move: function(direction, options) {

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

@@ -31,21 +31,22 @@
     button: null,
     input: null,
     select: null,
+    filtering_select: null,
 
     _create: function() {
-      var filtering_select = this.element.siblings(
+      this.filtering_select = this.element.siblings(
         '[data-input-for="' + this.element.attr('id') + '"]'
       );
 
       // When using the browser back and forward buttons, it is possible that
       // the autocomplete field will be cached which causes duplicate fields
       // to be generated.
-      if (filtering_select.length > 0) {
-        this.input = filtering_select.children('input');
-        this.button = filtering_select.children('.input-group-btn');
+      if (this.filtering_select.length > 0) {
+        this.input = this.filtering_select.children('input');
+        this.button = this.filtering_select.children('.input-group-btn');
       } else {
         this.element.hide();
-        filtering_select = this._inputGroup(this.element.attr('id'));
+        this.filtering_select = this._inputGroup(this.element.attr('id'));
         this.input = this._inputField();
         this.button = this._buttonField();
       }
@@ -56,7 +57,7 @@
       this._overloadRenderItem();
       this._autocompleteDropdownEvent(this.button);
 
-      return filtering_select.append(this.input)
+      return this.filtering_select.append(this.input)
         .append(this.button)
         .insertAfter(this.element);
     },
@@ -189,6 +190,11 @@
         input.attr('placeholder', this.element.attr('placeholder'));
       }
 
+      if (this.element.attr('required')) {
+        input.attr('required', this.element.attr('required'));
+        this.element.attr('required', false);
+      }
+
       return input;
     },
 
@@ -196,7 +202,7 @@
       return $('<div>')
         .addClass('input-group filtering-select col-sm-2')
         .attr('data-input-for', inputFor)
-        .css('float', 'left');
+        .css('float', this.element.css("float"));
     },
 
     _initAutocomplete: function() {
@@ -281,6 +287,7 @@
       this.input.remove();
       this.button.remove();
       this.element.show();
+      this.filtering_select.remove();
       $.Widget.prototype.destroy.call(this);
     }
   });