rails_admin 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 531cf0017e10c6ec70071cc36bf6f26bb022eb0a
-  data.tar.gz: 1660b6774fadf54a24b9d67a534305630727ccb1
+  metadata.gz: 7e491a0735ca200d0e74ad5dcb6bd299919da52b
+  data.tar.gz: 5a96d44742b0029c1d7554c532e7fa6ae6ed6853
 SHA512:
-  metadata.gz: f2ca04cae79c6bfcdaab54dfadcbaa72b36bdc715ac37d15bbaa52d9ff383b27f7d514fd76537e466ebb6dd76ef1b5805c53dc73ade5abb6af717e1164e6a3a7
-  data.tar.gz: 39da0448e0b86dde4a980fa8444ec09007d9e095285d89a2329eb8c79bc03a2ec56dbed0c9c8da2503e50ba3391f36c4687f7995ce3a3c02b67f985f5d080674
+  metadata.gz: 51af7b94bb6eb226489fdd111ba81bd17a16f32910c44c97876b427396d48c8b972c7b3ea288f3d850157c12bb1fa628351b878e6e2d1bcb1683ec6d402d7349
+  data.tar.gz: 99bedb21db9884f4f58c0ed3069e15961aad70209d75e1cd8dcbff99b6e5fa39a3ca02f90eb82593f0b8d44e9cccf2b2cd15ccefec1bcd4402b999acba041916

data/Gemfile

@@ -7,6 +7,7 @@ group :mongoid do
   gem 'mongoid', '~> 4.0.0'
   gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
   gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
+  gem 'refile-mongoid', '>= 0.0.1', platforms: [:ruby_21, :ruby_22]
 end
 
 group :active_record do
@@ -34,11 +35,11 @@ end
 
 group :test do
   gem 'cancan', '>= 1.6'
-  gem 'cancancan', '~> 1.9'
+  gem 'cancancan', '~> 1.12.0'
   gem 'capybara', '>= 2.1'
   gem 'carrierwave', '>= 0.8'
   gem 'coveralls'
-  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0']
+  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0']
   gem 'dragonfly', '~> 1.0'
   gem 'factory_girl', '>= 4.2'
   gem 'generator_spec', '>= 0.8'
@@ -46,11 +47,21 @@ group :test do
   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.31.0'
   gem 'simplecov', '>= 0.9', require: false
   gem 'timecop', '>= 0.5'
+
+  platforms :ruby_19 do
+    gem 'tins', '~> 1.6.0'
+  end
+
+  platforms :ruby_21, :ruby_22 do
+    gem 'refile', '~> 0.5', require: 'refile/rails'
+    gem 'refile-mini_magick', '>= 0.1.0'
+  end
 end
 
 gemspec

data/README.md

@@ -23,7 +23,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 * Search and filtering
 * Export data to CSV/JSON/XML
 * Authentication (via [Devise](https://github.com/plataformatec/devise) or other)
-* Authorization (via [Cancan](https://github.com/ryanb/cancan))
+* Authorization (via [CanCanCan](https://github.com/CanCanCommunity/cancancan) or [Pundit](https://github.com/elabs/pundit))
 * User action history (via [PaperTrail](https://github.com/airblade/paper_trail))
 * Supported ORMs
   * ActiveRecord
@@ -44,7 +44,7 @@ In `config/initializers/rails_admin`:
 
 [Details](https://github.com/sferik/rails_admin/wiki/Base-configuration)
 
-To begin with, you may be interested in setting up [Devise](https://github.com/sferik/rails_admin/wiki/Devise), [Cancan](https://github.com/sferik/rails_admin/wiki/Cancan) or [Papertrail](https://github.com/sferik/rails_admin/wiki/Papertrail)!
+To begin with, you may be interested in setting up [Devise](https://github.com/sferik/rails_admin/wiki/Devise), [CanCanCan](https://github.com/sferik/rails_admin/wiki/Cancancan) or [Papertrail](https://github.com/sferik/rails_admin/wiki/Papertrail)!
 
 ### Per model
 ```ruby

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

@@ -3,17 +3,20 @@
   var filters;
 
   $.filters = filters = {
-    options: {
-      regional: {
-        datePicker: {
-          dateFormat: 'mm/dd/yy'
-        }
-      }
-    },
-
-    append: function(field_label, field_name, field_type, field_value, field_operator, field_options, index) {
-      var value_name = 'f[' +  field_name + '][' + index + '][v]';
+    append: function(options) {
+      options = options || {};
+      var field_label = options['label'];
+      var field_name  = options['name'];
+      var field_type  = options['type'];
+      var field_value = options['value'];
+      var field_operator = options['operator'];
+      var select_options = options['select_options'];
+      var index = options['index'];
+      var value_name    = 'f[' +  field_name + '][' + index + '][v]';
       var operator_name = 'f[' +  field_name + '][' + index + '][o]';
+      var control = null;
+      var additional_control = null;
+
       switch(field_type) {
         case 'boolean':
           var control = '<select class="input-sm form-control" name="' + value_name + '">' +
@@ -26,9 +29,13 @@
           '</select>';
           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] || '') + '" />';
         case 'datetime':
         case 'timestamp':
-          var control = '<select class="switch-additionnal-fieldsets input-sm form-control" name="' + operator_name + '">' +
+          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>' +
@@ -39,29 +46,29 @@
             '<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>'
-          var additional_control =
-          '<input 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 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 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] || '') + '" />';
+          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] || '') + '" />';
           break;
         case 'enum':
           var multiple_values = ((field_value instanceof Array) ? true : false)
-          var 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">' +
+          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>' +
-              field_options +
+              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">' +
-              field_options +
+              select_options +
             '</select> ' +
             '<a href="#" class="switch-select"><i class="icon-' + (multiple_values ? 'minus' : 'plus') + '"></i></a>';
         break;
         case 'string':
         case 'text':
         case 'belongs_to_association':
-          var control = '<select class="switch-additionnal-fieldsets input-sm form-control" value="' + field_operator + '" name="' + operator_name + '">' +
+          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>' +
@@ -70,50 +77,57 @@
             '<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>'
-          var 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 + '" /> ';
+          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 + '" /> ';
           break;
         case 'integer':
         case 'decimal':
         case 'float':
-          var control = '<select class="switch-additionnal-fieldsets input-sm form-control" name="' + operator_name + '">' +
+          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>'
-          var additional_control =
+          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] || '') + '" />';
           break;
         default:
-          var control = '<input type="text" class="input-sm form-control" name="' + value_name + '" value="' + field_value + '"/> ';
+          control = '<input type="text" class="input-sm form-control" name="' + value_name + '" value="' + field_value + '"/> ';
           break;
       }
 
-      var content = '<p class="filter form-search">' +
-        '<span class="label label-info form-label"><a href="#" class="delete"><i class="icon-trash icon-white"></i></a> ' + field_label + '</span> ' +
-        control + " " +
-        (additional_control || '') +
-      '</p> ';
-      $('#filters_box').append(content);
-      $('#filters_box .date').datepicker(this.options.regional.datePicker);
+      var $content = $('<p>')
+        .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></a> ' + field_label + '</span>')
+        .append('&nbsp;' + control + '&nbsp;' + (additional_control || ''));
+
+      $('#filters_box').append($content);
+
+      $content.find('.date, .datetime').datetimepicker({
+        locale: RailsAdmin.I18n.locale,
+        showTodayButton: true,
+        format: options['datetimepicker_format']
+      });
+
       $("hr.filters_box:hidden").show('slow');
     }
   }
 
   $(document).on('click', "#filters a", function(e) {
     e.preventDefault();
-    $.filters.append(
-      $(this).data('field-label'),
-      $(this).data('field-name'),
-      $(this).data('field-type'),
-      $(this).data('field-value'),
-      $(this).data('field-operator'),
-      $(this).data('field-options'),
-      $.now().toString().slice(6,11)
-    );
+    $.filters.append({
+      label: $(this).data('field-label'),
+      name:  $(this).data('field-name'),
+      type:  $(this).data('field-type'),
+      value: $(this).data('field-value'),
+      operator: $(this).data('field-operator'),
+      select_options: $(this).data('field-options'),
+      index: $.now().toString().slice(6,11),
+      datetimepicker_format: $(this).data('field-datetimepicker-format')
+    });
   });
 
   $(document).on('click', "#filters_box .delete", function(e) {

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

@@ -17,6 +17,7 @@
         return { query: query };
       },
       sortable: false,
+      removable: true,
       regional: {
         up: "Up",
         down: "Down",
@@ -68,20 +69,23 @@
       this.collection = $('<select multiple="multiple"></select>');
 
       this.collection.addClass("form-control ra-multiselect-collection");
-      
+
       this.addAll = $('<a href="#" class="ra-multiselect-item-add-all"><span class="ui-icon ui-icon-circle-triangle-e"></span>' + this.options.regional.chooseAll + '</a>');
-      
+
       this.columns.left.html(this.collection)
                           .append(this.addAll);
-      
+
       this.collection.wrap('<div class="wrapper"/>');
-      
-      
+
+
       this.add = $('<a href="#" class="ui-icon ui-icon-circle-triangle-e ra-multiselect-item-add">' + this.options.regional.add + '</a>');
+      this.columns.center.append(this.add);
 
-      this.remove = $('<a href="#" class="ui-icon ui-icon-circle-triangle-w ra-multiselect-item-remove">' + this.options.regional.remove + '</a>');
+      if (this.options.removable) {
+        this.remove = $('<a href="#" class="ui-icon ui-icon-circle-triangle-w ra-multiselect-item-remove">' + this.options.regional.remove + '</a>');
+        this.columns.center.append(this.remove);
+      }
 
-      this.columns.center.append(this.add).append(this.remove)
       if (this.options.sortable) {
         this.up = $('<a href="#" class="ui-icon ui-icon-circle-triangle-n ra-multiselect-item-up">' + this.options.regional.up + '</a>');
         this.down = $('<a href="#" class="ui-icon ui-icon-circle-triangle-s ra-multiselect-item-down">' + this.options.regional.down + '</a>');
@@ -89,14 +93,14 @@
       }
 
       this.selection = $('<select class="form-control ra-multiselect-selection" multiple="multiple"></select>');
-      
-      
+      this.columns.right.append(this.selection);
+
 
-      this.removeAll = $('<a href="#" class="ra-multiselect-item-remove-all"><span class="ui-icon ui-icon-circle-triangle-w"></span>' + this.options.regional.clearAll + '</a>');
+      if (this.options.removable) {
+        this.removeAll = $('<a href="#" class="ra-multiselect-item-remove-all"><span class="ui-icon ui-icon-circle-triangle-w"></span>' + this.options.regional.clearAll + '</a>');
+        this.columns.right.append(this.removeAll);
+      }
 
-      this.columns.right.append(this.selection)
-                           .append(this.removeAll);
-      
       this.selection.wrap('<div class="wrapper"/>');
 
       this.element.css({display: "none"});
@@ -122,24 +126,26 @@
       /* Add to selection */
       this.add.click(function(e){
         widget._select($(':selected', widget.collection));
-        
-        e.preventDefault();
-        widget.selection.trigger('change');
-      });
 
-      /* Remove all from selection */
-      this.removeAll.click(function(e){
-        widget._deSelect($('option', widget.selection));
         e.preventDefault();
         widget.selection.trigger('change');
       });
 
-      /* Remove from selection */
-      this.remove.click(function(e){
-        widget._deSelect($(':selected', widget.selection));
-        e.preventDefault();
-        widget.selection.trigger('change');
-      });
+      if (this.options.removable) {
+        /* Remove all from selection */
+        this.removeAll.click(function(e){
+          widget._deSelect($('option', widget.selection));
+          e.preventDefault();
+          widget.selection.trigger('change');
+        });
+
+        /* Remove from selection */
+        this.remove.click(function(e){
+          widget._deSelect($(':selected', widget.selection));
+          e.preventDefault();
+          widget.selection.trigger('change');
+        });
+      }
 
       var timeout = null;
       if(this.options.sortable) {
@@ -180,7 +186,7 @@
           widget.collection.html('');
           for (i in filtered) {
             widget.collection.append(
-              $('<option></option>').attr('value', matches[i].id).attr('title', matches[i].label).text(matches[i].label)
+              $('<option></option>').attr('value', matches[filtered[i]].id).attr('title', matches[filtered[i]].label).text(matches[filtered[i]].label)
             );
           }
         } else {
@@ -189,15 +195,25 @@
       });
     },
 
+    /*
+     * Cache key is stored in the format `o_<option value>` to avoid JS
+     * engine coercing string keys to int keys, and thereby preserving
+     * the insertion order. The value for each key is in turn an object
+     * that stores the option tag's HTML text and the value. Example:
+     * cache = {
+     *    'o_271': { id: 271, value: 'CartItem #271'},
+     *    'o_270': { id: 270, value: 'CartItem #270'}
+     * }
+     */
     _buildCache: function(options) {
       var widget = this;
 
       this.element.find("option").each(function(i, option) {
         if (option.selected) {
-          widget._cache[option.value] = option.innerHTML;
+          widget._cache['o_' + option.value] = {id: option.value, value: option.innerHTML};
           $(option).clone().appendTo(widget.selection).attr("selected", false).attr("title", $(option).text());
         } else {
-          widget._cache[option.value] = option.innerHTML;
+          widget._cache['o_' + option.value] = {id: option.value, value: option.innerHTML};
           $(option).clone().appendTo(widget.collection).attr("selected", false).attr("title", $(option).text());
         }
       });
@@ -220,7 +236,8 @@
         if (!this.options.xhr) {
           for (i in this._cache) {
             if (this._cache.hasOwnProperty(i)) {
-              matches.push({id: i, label: this._cache[i]});
+              option = this._cache[i];
+              matches.push({id: option.id, label: option.value});
             }
           }
           success.apply(this, [matches]);
@@ -246,8 +263,9 @@
           query = new RegExp(query + '.*', 'i');
 
           for (i in this._cache) {
-            if (this._cache.hasOwnProperty(i) && query.test(this._cache[i])) {
-              matches.push({id: i, label: this._cache[i]});
+            if (this._cache.hasOwnProperty(i) && query.test(this._cache[i]['value'])) {
+              option = this._cache[i];
+              matches.push({id: option.id, label: option.value});
             }
           }
 

data/app/assets/javascripts/rails_admin/ra.i18n.coffee

@@ -1,6 +1,8 @@
-class @RailsAdmin
+@RailsAdmin ||= {}
 @RailsAdmin.I18n = class Locale
-  @init: (@locale)->
+  @init: (@locale, @translations)->
+    moment.locale(@locale)
+
   @t:(key) ->
     humanize = key.charAt(0).toUpperCase() + key.replace(/_/g, " ").slice(1)
-    @locale[key] || humanize
+    @translations[key] || humanize

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

@@ -20,10 +20,22 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
           $(that).val(hex)
           $(that).css('backgroundColor', '#' + hex)
 
-    # datetime
+    # datetime picker
+    $.fn.datetimepicker.defaults.icons =
+      time:     'fa fa-clock-o'
+      date:     'fa fa-calendar'
+      up:       'fa fa-chevron-up'
+      down:     'fa fa-chevron-down'
+      previous: 'fa fa-angle-double-left'
+      next:     'fa fa-angle-double-right'
+      today:    'fa fa-dot-circle-o'
+      clear:    'fa fa-trash'
+      close:    'fa fa-times'
 
     content.find('[data-datetimepicker]').each ->
-      $(this).datetimepicker $(this).data('options')
+      options = $(this).data('options')
+      $.extend(options, {locale: RailsAdmin.I18n.locale})
+      $(this).datetimepicker options
 
     # enumeration
 
@@ -63,7 +75,7 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
     content.find('[data-filteringmultiselect]').each ->
       $(this).filteringMultiselect $(this).data('options')
       if $(this).parents("#modal").length # hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
-        $(this).parents('.control-group').find('.btn').remove()
+        $(this).siblings('.btn').remove()
       else
         $(this).parents('.control-group').first().remoteForm()
 
@@ -72,7 +84,7 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
     content.find('[data-filteringselect]').each ->
       $(this).filteringSelect $(this).data('options')
       if $(this).parents("#modal").length # hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
-        $(this).parents('.control-group').find('.btn').remove()
+        $(this).siblings('.btn').remove()
       else
         $(this).parents('.control-group').first().remoteForm()
 
@@ -151,9 +163,12 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
             beforeSend: (xhr) ->
               xhr.setRequestHeader("Accept", "application/json")
             success: (data, status, xhr) ->
-              html = '<option></option>'
+              html = $('<option></option>')
               $(data).each (i, el) ->
-                html += '<option value="' + el.id + '">' + el.label + '</option>'
+                option = $('<option></option>')
+                option.attr('value', el.id)
+                option.text(el.label)
+                html = html.add(option)
               object_select.html(html)
 
     # ckeditor