effective_datatables 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd41f4b17a43b69b4164c73ec1c27333ff277423
-  data.tar.gz: ac99a8b3b030df212aef90af6600ce95545dede6
+  metadata.gz: a29491d068f5a2c17bd0c3702d235c733cb6d137
+  data.tar.gz: b18bded84b1f430cfd9742be32f2ee05f5aa6a3d
 SHA512:
-  metadata.gz: ce3b38c75aefba7aaedcbe339ed6ec87f59c878a8cac244c4f197d711efee35391bcf3498f1c775261bf2ca3f18b0288cd9a4b036711fd9a796c2ff2bb8953a3
-  data.tar.gz: ae522ad82d750f286ffe766eb205ac8417fc908558b62c1d9ffed46a17769d85e0e4fcd8c8ab53c1704aaa829517626e5aacd21e0d68501d93b349362f583ab1
+  metadata.gz: 5e2300b19ee1ced3eb8eca3105be074ef5a837016922584621b6894061d87d4d8646b5682714e2ddc4aee16a87ccb642ac3554f8da89b12db66e9345463abbaa
+  data.tar.gz: d5688eda80d509c2b059f09fd5ec3b281398a2f26b4e17228c1ff8c2bac360ccf146fe61d886e6eae905ae249a9df5cd7a5f1052fe6731385ec4996eb1a629c0

data/README.md

@@ -571,6 +571,24 @@ Check whether the datatable has records by calling `@datatable.empty?` and `@dat
 
 Keep in mind, these methods look at the collection's total records, not the currently displayed/filtered records.
 
+### Hide the buttons
+
+To hide the Bulk Actions, Show / Hide Columns, CSV, Excel, Print, etc buttons:
+
+```ruby
+render_datatable(@datatable, buttons: false)
+```
+
+### Override javascript options
+
+The javascript options used to initialize a datatable can be overriden as follows:
+
+```ruby
+render_datatable(@datatable, {dom: "<'row'<'col-sm-12'tr>>", autoWidth: true})
+```
+
+Please see [datatables options](https://datatables.net/reference/option/) for a list of initialization options.
+
 
 ### Customize Filter Behaviour
 

data/app/assets/javascripts/effective_datatables.js

@@ -16,6 +16,7 @@
 //= require dataTables/responsive/responsive.bootstrap.min
 
 //= require effective_datatables/bulk_actions
+//= require effective_datatables/responsive
 //= require effective_datatables/initialize
 
 $.extend( $.fn.dataTable.defaults, {

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

@@ -6,6 +6,9 @@ initializeDataTables = ->
     simple = (datatable.data('simple') == true)
     input_js_options = datatable.data('input-js-options') || {}
 
+    if input_js_options['buttons'] == false
+      input_js_options['buttons'] = []
+
     init_options =
       ajax: { url: datatable.data('source'), type: 'POST' }
       autoWidth: false

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

@@ -0,0 +1,4 @@
+$(document).on 'shown.bs.tab', "a[data-toggle='tab']", (event) ->
+  $($(event.target).attr('href')).find('table.dataTable').each ->
+    $(this).DataTable().columns.adjust().responsive.recalc()
+

data/app/models/effective/active_record_datatable_tool.rb

@@ -88,8 +88,13 @@ module Effective
 
         obj = reflection.build_association({})
         klass = obj.class
+        polymorphic = reflection.options[:as].present?
+
+        inverse = reflection.inverse_of
+        inverse ||= klass.reflect_on_association(reflection.options[:as]) if polymorphic
+        inverse ||= klass.reflect_on_association(collection.table_name)
+        inverse ||= obj.class.reflect_on_association(collection.table_name.singularize)
 
-        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 = if [:select, :grouped_select].include?(table_column[:filter][:as])
@@ -97,7 +102,11 @@ module Effective
           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)
+          if polymorphic
+            klass.where(id: inverse_ids).where(reflection.type => collection.klass.name).pluck(reflection.foreign_key)
+          else
+            klass.where(id: inverse_ids).joins(inverse.name).pluck(inverse.foreign_key)
+          end
         else
           # Treat the search term as a string.
           klass_columns = if (sql_column == klass.table_name) # No custom column has been defined
@@ -106,9 +115,17 @@ module Effective
             [sql_column.gsub("#{klass.table_name}.", '')] # table_column :order_items, column: 'order_items.title'
           end
 
+          if polymorphic
+            klass_columns -= [reflection.type]
+          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)
+          if polymorphic
+            klass.where(conditions.join(' OR '), term: "%#{term}%", num: term.to_i).where(reflection.type => collection.klass.name).pluck(reflection.foreign_key)
+          else
+            klass.where(conditions.join(' OR '), term: "%#{term}%", num: term.to_i).joins(inverse.name).pluck(inverse.foreign_key)
+          end
         end
 
         collection.public_send(sql_op, id: ids)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.4.2'.freeze
+  VERSION = '2.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,7 @@ files:
 - app/assets/javascripts/effective_datatables.js
 - app/assets/javascripts/effective_datatables/bulk_actions.js.coffee
 - app/assets/javascripts/effective_datatables/initialize.js.coffee
+- app/assets/javascripts/effective_datatables/responsive.js.coffee
 - app/assets/javascripts/vendor/jquery.debounce.min.js
 - app/assets/javascripts/vendor/jszip.min.js
 - app/assets/stylesheets/dataTables/buttons/buttons.bootstrap.min.css