effective_datatables 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8936f9d6cfd2f9ca5a02c280c4f388526429dc15
-  data.tar.gz: 35401b2a9625a6f6160401d9c6efb311f29d2321
+  metadata.gz: 6595ee6f3ff2e56ffd6066b8d649619e919b4837
+  data.tar.gz: 7d0b22801aaf7098bced2efd34a353ecb63fc41e
 SHA512:
-  metadata.gz: e10681215022737bd36e39088b505365873a0ea63f3a419771579f7832a6b81fde1edc81f8601db1af7dce940c01a6b12b196f90eac880fbc730e4d6d1d5fbdb
-  data.tar.gz: d243ff06c93761d84146fe39263db11ac0bd3665664da926d676e723541b7d153365ba59106c6ea1feafcf56d271b00bddb971c7e0c4b9a81c1f1a4a9be8495a
+  metadata.gz: a37dd4357ac17b28bf4fb5d605db9a5cd9c37318f35ddfbcce467775568750a066b7fba9aec123ec9674ebd6c4a0ad597cbcab96c751e659b13e71bb28ce12a3
+  data.tar.gz: e2f105f6c9dbfa8bb6acca5dc53c9e3220fb763ac290c8e8c1c9dd6e1aef79b907b386e1f289e4d999da2607cc37a409d65c051111fd5268060618f95fb5c084

data/README.md

@@ -340,6 +340,10 @@ table_column :created_at, :filter => {...}    # Enable filtering with these opti
 :filter => {:type => :select, :values => [*2010..(Time.zone.now.year+6)]}
 :filter => {:type => :select, :values => Proc.new { PostCategory.all } }
 :filter => {:type => :select, :values => Proc.new { User.all.order(:email).map { |obj| [obj.id, obj.email] } } }
+
+:filter => {:type => :grouped_select, :values => {'Active' => Events.active, 'Past' => Events.past }}
+:filter => {:type => :grouped_select, :values => {'Active' => [['Event A', 1], ['Event B', 2]], 'Past' => [['Event C', 3], ['Event D', 4]]} }
+
 ```
 
 Some additional, lesser used options include:

data/app/helpers/effective_datatables_helper.rb

@@ -40,7 +40,7 @@ module EffectiveDatatablesHelper
         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.id] }
+          opts[:filter][:values] = opts[:filter][:values].map { |obj| [obj.to_s, obj.to_param] }
         end
       end
 
@@ -51,6 +51,29 @@ module EffectiveDatatablesHelper
         include_blank: (opts[:label] || name.titleize),
         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: :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,
+        input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
+        input_js: { placeholder: (opts[:label] || name.titleize) }
     else
       content_tag(:p, opts[:label] || name)
     end

data/app/models/effective/active_record_datatable_tool.rb

@@ -47,6 +47,15 @@ module Effective
         else
           collection.public_send(sql_op, "#{column} ILIKE :term", term: "%#{term}%")
         end
+      when :belongs_to_polymorphic
+        # our key will be something like Post_15, or Event_1
+        (type, id) = term.split('_')
+
+        if type.present? && id.present?
+          collection.public_send(sql_op, "#{column} = :id AND #{column.sub('_id"', '_type"')} = :type", id: id, type: type)
+        else
+          collection
+        end
       when :has_many
         inverse_ids = term.split(',').map { |term| (term = term.to_i) == 0 ? nil : term }.compact
         return collection unless inverse_ids.present?

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

@@ -16,10 +16,12 @@ module Effective
         # Here we identify all belongs_to associations and build up a Hash like:
         # {user: {foreign_key: 'user_id', klass: User}, order: {foreign_key: 'order_id', klass: Effective::Order}}
         belong_tos = (collection.klass.reflect_on_all_associations(:belongs_to) rescue []).inject({}) do |retval, bt|
-          next if bt.options[:polymorphic]
-
-          klass = bt.klass || (bt.foreign_type.sub('_type', '').classify.constantize rescue nil)
-          retval[bt.name.to_s] = {foreign_key: bt.foreign_key, klass: klass} if bt.foreign_key.present? && klass.present?
+          if bt.options[:polymorphic]
+            retval[bt.name.to_s] = {foreign_key: bt.foreign_key, klass: bt.name, polymorphic: true}
+          else
+            klass = bt.klass || (bt.foreign_type.sub('_type', '').classify.constantize rescue nil)
+            retval[bt.name.to_s] = {foreign_key: bt.foreign_key, klass: klass} if bt.foreign_key.present? && klass.present?
+          end
 
           retval
         end
@@ -55,7 +57,11 @@ module Effective
 
           cols[name][:type] ||= (
             if belong_tos.key?(name)
-              :belongs_to
+              if belong_tos[name][:polymorphic]
+                :belongs_to_polymorphic
+              else
+                :belongs_to
+              end
             elsif has_manys.key?(name)
               :has_many
             elsif sql_column.try(:type).present?
@@ -67,8 +73,8 @@ module Effective
 
           cols[name][:class] = "col-#{cols[name][:type]} col-#{name} #{cols[name][:class]}".strip
 
-          # HasMany
-          if cols[name][:type] == :has_many
+          # We can't easily sort these fields
+          if cols[name][:type] == :has_many || cols[name][:type] == :belongs_to_polymorphic
             cols[name][:sortable] = false
           end
 
@@ -118,7 +124,7 @@ module Effective
         filter[:selected] = filter[:selected].to_s unless filter[:selected].nil?
 
         # If you pass values, just assume it's a select
-        filter[:type] ||= :select if filter.key?(:values)
+        filter[:type] ||= :select if filter.key?(:values) && col_type != :belongs_to_polymorphic
 
         # Check if this is an aggregate column
         if ['SUM(', 'COUNT(', 'MAX(', 'MIN(', 'AVG('].any? { |str| sql_column.include?(str) }
@@ -137,6 +143,8 @@ module Effective
               end
             )
           }
+        when :belongs_to_polymorphic
+          {type: :grouped_select, values: {}}
         when :has_many
           {
             type: :select,

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

@@ -113,6 +113,8 @@ module Effective
               view.instance_exec(obj, collection, self, &opts[:proc])
             elsif opts[:type] == :belongs_to
               (obj.send(name) rescue nil).to_s
+            elsif opts[:type] == :belongs_to_polymorphic
+              (obj.send(name) rescue nil).to_s
             elsif opts[:type] == :has_many
               objs = (obj.send(name).map { |x| x.to_s }.sort rescue [])
               objs.length == 1 ? objs.first : (opts[:sentence] ? objs.to_sentence : objs.join('<br>'))

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.4'.freeze
 end

metadata

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