effective_datatables 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5282c6fc8d0dfa572243a3d922182600bf611a
-  data.tar.gz: 2a176f9e34f0bc71180bb66f6b91699306e1ee7a
+  metadata.gz: 9ea3f8a64eeea58bc0945f3c9884c6eedd4c8c78
+  data.tar.gz: 460493dc0ecf8d2c2940b5188a1e2d7df48397c7
 SHA512:
-  metadata.gz: c32b379fe3f045efecf295350e5d2385802c60d8f2e95d293bfa6523ba938540fb8c110e39bb2c0f100ce59630f7ebbf2813c3f7a02231e3203f1bd7e9cd703c
-  data.tar.gz: 9fa36118ddc8e3427589f0f6a642b9305b5855cec61176885d77c97357ddd874d1d7fbd71c67d985d85f68fe474fb50dd6ef0635ef65f007eceebb46e7342402
+  metadata.gz: 5fdd97c930b76e77c7c46dbcbe4040c5b4c231b943a87f4798232824097e5d30791a56b452c7b377607bf26285d3666dc39292f790a398194fada0a972030923
+  data.tar.gz: beecbf35928fc8efc5bcfbc20744908746601f68a67d4207e7df75f601da36dd25910549825467cdcca05a9dc2d8e70eaad225e8c19efe1b07e8d436e3c22cb5

data/app/helpers/effective_datatables_helper.rb

@@ -22,6 +22,7 @@ module EffectiveDatatablesHelper
     when :string, :text, :number
       form.input name, label: false, required: false, as: :string, placeholder: (opts[:label] || name),
         input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
+
     when :date
       form.input name, label: false, required: false,
         as: (defined?(EffectiveFormInputs) ? :effective_date_picker : :string),
@@ -34,16 +35,7 @@ module EffectiveDatatablesHelper
         placeholder: (opts[:label] || name),
         input_group: false,
         input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
-
     when :select, :boolean
-      if opts[:filter][:values].respond_to?(:call)
-        opts[:filter][:values] = opts[:filter][:values].call()
-
-        if opts[:filter][:values].kind_of?(ActiveRecord::Relation) || (opts[:filter][:values].kind_of?(Array) && opts[:filter][:values].first.kind_of?(ActiveRecord::Base))
-          opts[:filter][:values] = opts[:filter][:values].map { |obj| [obj.to_s, obj.to_param] }
-        end
-      end
-
       form.input name, label: false, required: false,
         as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
         collection: opts[:filter][:values],
@@ -52,26 +44,15 @@ module EffectiveDatatablesHelper
         input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { placeholder: (opts[:label] || name.titleize) }
     when :grouped_select
-      raise "Expected :group_select filter to define its values as a Hash {'Posts' => Post.all, 'Events' => Event.all} or a Hash {'Posts' => [['Post A', 1], ['Post B', 2]], 'Events' => [['Event A', 1], ['Event B', 2]]}" unless opts[:filter][:values].kind_of?(Hash)
-
-      opts[:filter][:values].each do |group, options|
-        if options.kind_of?(ActiveRecord::Relation)
-          if opts[:type] == :belongs_to_polymorphic
-            opts[:filter][:values][group] = options.map { |obj| [obj.to_s, "#{options.model_name}_#{obj.to_param}"] }
-          else
-            opts[:filter][:values][group] = options.map { |obj| [obj.to_s, obj.to_param] }
-          end
-        end
-      end
-
       form.input name, label: false, required: false,
         as: (defined?(EffectiveFormInputs) ? :effective_select : :grouped_select),
         collection: opts[:filter][:values],
         multiple: opts[:filter][:multiple] == true,
         include_blank: (opts[:label] || name.titleize),
         grouped: true,
-        group_label_method: :first,
-        group_method: :last,
+        polymorphic: opts[:filter][:polymorphic] == true,
+        group_label_method: opts[:filter][:group_label_method] || :first,
+        group_method: opts[:filter][:group_method] || :last,
         input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { placeholder: (opts[:label] || name.titleize) }
     else

data/app/models/effective/effective_datatable/options.rb

@@ -146,7 +146,7 @@ module Effective
             )
           }
         when :belongs_to_polymorphic
-          {type: :grouped_select, values: {}}
+          {type: :grouped_select, polymorphic: true, values: {}}
         when :has_many
           {
             type: :select,

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.9'.freeze
+  VERSION = '2.1.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails