effective_datatables 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76b1cc1f0029f8a223dee58f8631d9287eac4b85
-  data.tar.gz: 128aeb70dd5f4a02356356c4b9668117773202bd
+  metadata.gz: 96df2e08f32b87a62ce043e3760697cb7439d134
+  data.tar.gz: e053c8993e6f151086fe31e1daeb4a24b984f17a
 SHA512:
-  metadata.gz: 4e5a42ac21c1228b1bdfedf8b84721f633cb6de20add6fb0137208c0df4646f6957d9c1ffadaed3204cf9d3a93f992e7f3093c0781319f4f7313a93bc615e42e
-  data.tar.gz: 9fab83262b0d391514892d21e4cde08c85213a23efdbfb0dfb02b901448d96680134d882d06c62eb2a5b06de0800e3f8c2b95eb149489b5a07ea305338683d9a
+  metadata.gz: 1b3b944e79218ff0a5ae54d6080be055e4b15c14da25337b2d6400efc8a1703839b41c25a4dafb8759a645ea8f5dc9a015b4fed5545c416f76802c5711436efe
+  data.tar.gz: dfb15a2aceb2d3615c7cae86453fd5ed8e2e10eae999ed9672aa5923dde2798d1ae4a1e04a7451b4ba67383418d0da662238c0c23c9582b079dfd644595c0a14

data/README.md

@@ -863,7 +863,7 @@ datatable do
   end.search do |collection, term, column, sql_column|
     # collection is an ActiveRecord scoped collection
     # term is the incoming PostCategory ID as per the search
-    # column is this column's attributes Hash
+    # column is this column's options Hash
     # sql_column is the column[:sql_column]
     categories = current_user.post_categories.where(id: term.to_i)
 
@@ -911,13 +911,13 @@ The search and sort for each column will be merged together to form the final re
 
 ### Default search collection
 
-When using a `col :user` type belongs_to or has_many column, a search collection for that class will be loaded.
+When using a `col :comments` type belongs_to or has_many column, a search collection for that class will be loaded.
 
 Add the following to your related model to customize the search collection:
 
 ```ruby
 class Comment < ApplicationRecord
-  scope :datatables_filter, -> { Comment.includes(:user) }
+  scope :datatables_filter, -> { includes(:user) }
 end
 ```
 
@@ -993,7 +993,7 @@ There are a few other ways to customize the behaviour of effective_datatables
 
 ## Checking for Empty collection
 
-Check whether the datatable has records by calling `@datatable.empty?` and `@datatable.present?`.
+Check whether the datatable has records by calling `@datatable.present?` and `@datatable.blank?`.
 
 ## Override javascript options
 

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -142,7 +142,7 @@ initializeDataTables = ->
         $th = $(api.column(index).header())
         settings = api.settings()[0].aoColumns[index] # column specific settings
 
-        if settings.search && ('' + settings.search).length > 0 # Assign preselected values
+        if settings.search != null # Assign preselected values
           api.settings()[0].aoPreSearchCols[index].sSearch = settings.search
 
         if settings.searchHtml  # Append the search html and initialize input events

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -158,4 +158,9 @@ table.dataTable tbody {
   td.col-bulk_actions {
     input[type='checkbox'] { margin-left: 1px; margin-right: 1px; }
   }
+
+  td {
+    p { margin-bottom: 0px; }
+  }
+
 }

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

@@ -69,7 +69,7 @@ module Effective
             elsif array_collection?
               obj[opts[:index]]
             elsif opts[:sql_as_column]
-              obj[name] || obj.send(name)
+              obj[name] || (obj.send(name) if obj.respond_to?(name))
             else
               obj.send(name)
             end

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

@@ -89,12 +89,17 @@ module Effective
 
           if search[:collection].kind_of?(ActiveRecord::Relation)
             search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
+          elsif search[:collection].kind_of?(Array) && search[:collection].first.kind_of?(ActiveRecord::Base)
+            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
           elsif search[:collection].kind_of?(Array)
             search[:collection].each { |obj| obj[1] = 'nil' if obj[1] == nil }
           end
 
+          search[:value] ||= search.delete(:selected) if search.key?(:selected)
+
           search[:as] ||= :select if (search.key?(:collection) && opts[:as] != :belongs_to_polymorphic)
-          search[:fuzzy] = true unless search.key?(:fuzzy)
+
+          search[:fuzzy] = (opts[:sql_as_column] != true) unless search.key?(:fuzzy)
 
           if array_collection? && opts[:resource].present?
             search.reverse_merge!(resource.search_form_field(name, collection.first[opts[:index]]))

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

@@ -148,9 +148,9 @@ module Effective
         # Set default order direction
         state[:order_dir] ||= ['_at', '_on', 'date'].any? { |str| order_name.to_s.end_with?(str) } ? :desc : :asc
 
-        if state[:search].blank?
+        if state[:search].blank? && !datatables_ajax_request?
           columns.each do |name, opts|
-            state[:search][name] = opts[:search][:value] if opts[:search].kind_of?(Hash) && opts[:search].key?(:value)
+            state[:search][name] = opts[:search][:value] if (opts[:search] || {}).key?(:value)
           end
         end
 

data/config/effective_datatables.rb

@@ -38,7 +38,4 @@ EffectiveDatatables.setup do |config|
     destroy: true,
   }
 
-  # Which packages to load when using the charts DSL
-  config.google_chart_packages = ['corechart']
-
 end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.0.8'.freeze
 end

data/lib/effective_datatables.rb

@@ -8,7 +8,6 @@ module EffectiveDatatables
 
   mattr_accessor :default_length
   mattr_accessor :actions_column # A Hash
-  mattr_accessor :google_chart_packages
 
   def self.setup
     yield self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails