rails_admin 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5f7c910bef240049b818e4189a241c41e68e180
-  data.tar.gz: ea59f46605ddef6defbe19c6846d3d9ee6419166
+  metadata.gz: d27a09f1e2cf25bfca10937bcd279281e982f14b
+  data.tar.gz: 51952b4144d0ad13b3e7e5790b63cff53480502c
 SHA512:
-  metadata.gz: c9c9d4bc637f60e21978c7ce73f693987de692177f79a61ab27757cd75b3ee531575d5bff729361d57c2fad35e82eb48763b5dc4a0c8615394569af7a2a5da5f
-  data.tar.gz: 9f16f21be6393621ee9e3b3de88fa3c4c11e75d2d972b88fe411acc04625568adba1c580ede46ae97c012b637b1d75730b49515d3e0379ea8949806e78f851b2
+  metadata.gz: fa0d0657963371052c1851983b8b371ce44171d215fce5f0d50ddd6d638bc543329930918b46172ff555fe558ff179d2b9fe45ab8326035ea031be61db4ebf93
+  data.tar.gz: 75e8e10ba79d3b1bec8515a9277ee2e613e70307d549f38136763c65c6d301f22348ef803e9d09fedbbffc4e01ad598eb48c847857cbc34e6503d572319ca8e5

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

@@ -33,22 +33,21 @@
     select: null,
 
     _create: function() {
-      var filtering_select;
+      var 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 (this.element.is(':visible')) {
+      if (filtering_select.size() > 0) {
+        this.input = filtering_select.children('input');
+        this.button = filtering_select.children('.input-group-btn');
+      } else {
         this.element.hide();
         filtering_select = this._inputGroup(this.element.attr('id'));
         this.input = this._inputField();
         this.button = this._buttonField();
-      } else {
-        filtering_select = this.element.siblings(
-          '[data-input-for="' + this.element.attr('id') + '"]'
-        );
-        this.input = filtering_select.children('input');
-        this.button = filtering_select.children('.input-group-btn');
       }
 
       this._setOptionsSource();

data/app/controllers/rails_admin/main_controller.rb

@@ -120,7 +120,7 @@ module RailsAdmin
     end
 
     def get_collection(model_config, scope, pagination)
-      associations = model_config.list.fields.select { |f| f.type == :belongs_to_association && !f.polymorphic? }.collect { |f| f.association.name }
+      associations = model_config.list.fields.select { |f| f.try(:eager_load?) }.collect { |f| f.association.name }
       options = {}
       options = options.merge(page: (params[Kaminari.config.param_name] || 1).to_i, per: (params[:per] || model_config.list.items_per_page)) if pagination
       options = options.merge(include: associations) unless associations.blank?

data/lib/rails_admin/config/fields/association.rb

@@ -62,6 +62,10 @@ module RailsAdmin
           association.foreign_key_nullable?
         end
 
+        register_instance_option :eager_load? do
+          !!searchable
+        end
+
         # Reader for the association's child model's configuration
         def associated_model_config
           @associated_model_config ||= RailsAdmin.config(association.klass)

data/lib/rails_admin/config/fields/types/belongs_to_association.rb

@@ -31,6 +31,10 @@ module RailsAdmin
             true
           end
 
+          register_instance_option :eager_load? do
+            true
+          end
+
           def selected_id
             bindings[:object].send(foreign_key)
           end

data/lib/rails_admin/config/fields/types/polymorphic_association.rb

@@ -45,6 +45,10 @@ module RailsAdmin
             [children_fields]
           end
 
+          register_instance_option :eager_load? do
+            false
+          end
+
           def associated_collection(type)
             return [] if type.blank?
             config = RailsAdmin.config(type)

data/lib/rails_admin/version.rb

@@ -1,7 +1,7 @@
 module RailsAdmin
   class Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder