effective_datatables 2.2.10 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8df18bd0c74dc210b4825617d73e5e7a4000948
-  data.tar.gz: 9465d7616e52566bfbbb395c365baf8b854f9c90
+  metadata.gz: 925dbdcde129594000b35c33bdcca9d40a2270a2
+  data.tar.gz: 45aaec09d5196309e7975c51de52ad97f2d52690
 SHA512:
-  metadata.gz: 50946449d7c9c9fc3c7cbcea28d62486d82c58191390715cff5363592a511362e052867d4d47362c36fbacf03ce27a40ea9f9c84ef35db7806c563bb7d14704f
-  data.tar.gz: dee241d33a01cc8d025f20afc868ad1806635cb51cae3fdbd4ae028d4a19062b6a1b534d01682c239f2bd132910f03b32dab5e0261050e8ebee2062f2e28e4c8
+  metadata.gz: 3cd98bc405d0be8aa0da7c8fccbc0657334bdb619ffef1f4f114051ec1ab2ab8d5ace4806da40ce2178855118e351fba9b03d357599e4a04cd080f82b24ee049
+  data.tar.gz: d743c635c18acb6b64a051e944fcc787e57f753f6b3a0767da299711262542dcca7e5d146f02885e9e1bc91d28c0c2950d5bb0e34c7bde8639d36dd29ceeec07

data/app/models/effective/active_record_datatable_tool.rb

@@ -72,19 +72,33 @@ module Effective
           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?
-
         reflection = collection.klass.reflect_on_association(table_column[:name].to_sym)
         raise "unable to find #{collection.klass.name} :has_many :#{table_column[:name]} association" unless reflection
 
-        obj = reflection.build_association({}) # Clinic
+        obj = reflection.build_association({})
         klass = obj.class
 
         inverse = reflection.inverse_of || klass.reflect_on_association(collection.table_name) || obj.class.reflect_on_association(collection.table_name.singularize)
         raise "unable to find #{klass.name} has_many :#{collection.table_name} or belongs_to :#{collection.table_name.singularize} associations" unless inverse
 
-        ids = klass.where(id: inverse_ids).joins(inverse.name).pluck(inverse.foreign_key)
+        ids = if [:select, :grouped_select].include?(table_column[:filter][:type])
+          # Treat the search term as one or more IDs
+          inverse_ids = term.split(',').map { |term| (term = term.to_i) == 0 ? nil : term }.compact
+          return collection unless inverse_ids.present?
+
+          klass.where(id: inverse_ids).joins(inverse.name).pluck(inverse.foreign_key)
+        else
+          # Treat the search term as a string.
+          klass_columns = if (table_column[:column] == klass.table_name) # No custom column has been defined
+            klass.columns.map { |col| col.name if col.text? }.compact  # Search all database text? columns
+          else
+            [table_column[:column].gsub("#{klass.table_name}.", '')] # table_column :order_items, column: 'order_items.title'
+          end
+
+          conditions = klass_columns.map { |col_name| "#{klass.table_name}.#{col_name} #{ilike} :term" }
+
+          klass.where(conditions.join(' OR '), term: "%#{term}%", num: term.to_i).joins(inverse.name).pluck(inverse.foreign_key)
+        end
 
         collection.public_send(sql_op, id: ids)
       when :obfuscated_id

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.2.10'.freeze
+  VERSION = '2.2.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails