effective_datatables 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e523e05861fc5fdbd733ad70cecffd66dd4bccc
-  data.tar.gz: b8fe6b15fa56c7678a2a27730ac015d73b3c0f5e
+  metadata.gz: 7cdc927bf2940be1078c34f616240946897ea1ee
+  data.tar.gz: 6571eb1c948e2ae416942df7a8e64d3dc4ab57b6
 SHA512:
-  metadata.gz: 40bc6660bd4fad913a122f25c857e683290dc4ed51449e097890da7018a8623d188968d8b3cf16c563a490430f042c5cfa03ca522bddfeff2813e10b544d04aa
-  data.tar.gz: 1f014ef661c4b3f0646f7c98362e2a4d76595bfa2f4b26893c75453038b331c01e0f2442536936e081a32369ea280ee504c16ec4fe81dbdb76ce5cafc8733ecb
+  metadata.gz: 0876a4a579a73102516f86011c7068ca507d8989ebdb521789865b52abea0c7a8241740aa78d36f8ccb1f1c382ec249bcd28a8fa7f602d107788a330a5751a6d
+  data.tar.gz: 7ae535aae2e2c4199871b2a54549e242dc380de87014cae375b226212fb860422d6a02d670d8f304dcb7c4c8d1f0330d360d6d5c6342e953f5ccfca890c61d32

data/README.md

@@ -435,32 +435,8 @@ To skip rendering the datatable and instead render given content:
 
 While the 'what to render when empty' situation is handled by the above syntax, you may still check whether the datatable has records to display by calling `@datatable.empty?` and `@datatable.present?`.
 
-The gotcha with these methods is that the `@datatable.view` must first be assigned (which is done automatically by the `render_datatable` view method).
+Keep in mind, these methods look at the collection's total records, rather than the display/filtered records.
 
-This implementation is a bit awkward but has significant performance tradeoffs.
-
-To check for an empty datatable collection before it's rendered, you must manually assign a view:
-
-```ruby
-class PostsController < ApplicationController
-  def index
-    @datatable = Effective::Datatables::Posts.new()
-    @datatable.view = view_context  # built in Rails controller method refering to the view
-    @datatable.empty?
-  end
-end
-```
-
-or
-
-```ruby
-class PostsController < ApplicationController
-  def index
-    @datatable = Effective::Datatables::Posts.new()
-    @datatable.empty?(view_context)
-  end
-end
-```
 
 ### Customize Filter Behaviour
 

data/app/models/effective/datatable.rb

@@ -89,31 +89,19 @@ module Effective
       raise 'Effective::Datatable to_json called with a nil view.  Please call render_datatable(@datatable) or @datatable.view = view before this method' unless view.present?
 
       @json ||= {
-        :sEcho => params[:sEcho].to_i,
-        :aaData => table_data || [],
-        :iTotalRecords => (
-          unless total_records.kind_of?(Hash)
-            total_records.to_i
-          else
-            (total_records.keys.map(&:first).uniq.count rescue 1)
-          end),
-        :iTotalDisplayRecords => (
-          unless display_records.kind_of?(Hash)
-            display_records.to_i
-          else
-            (display_records.keys.map(&:first).uniq.count rescue 1)
-          end)
+        :sEcho => (params[:sEcho] || 0),
+        :aaData => (table_data || []),
+        :iTotalRecords => (total_records || 0)
+        :iTotalDisplayRecords => (display_records || 0)
       }
     end
 
-    def present?(view = nil)
-      self.view = view unless view.nil?
-      to_json[:iTotalDisplayRecords] > 0
+    def present?
+      total_records.to_i > 0
     end
 
-    def empty?(view = nil)
-      self.view = view unless view.nil?
-      to_json[:iTotalDisplayRecords] == 0
+    def empty?
+      total_records.to_i == 0
     end
 
     # Wish these were protected
@@ -193,6 +181,16 @@ module Effective
       params[:iDisplayStart].to_i / per_page + 1
     end
 
+    def total_records
+      @total_records ||= (
+        if active_record_collection?
+          (collection_class.connection.execute("SELECT COUNT(*) FROM (#{collection.to_sql}) AS datatables_total_count").first['count'] rescue 1).to_i
+        else
+          collection.size
+        end
+      )
+    end
+
     def view=(view_context)
       @view = view_context
       @view.formats = [:html]
@@ -212,7 +210,6 @@ module Effective
         @view.class.module_eval(methods_for_view)
       rescue => e
       end
-
     end
 
     protected
@@ -223,16 +220,12 @@ module Effective
       col = collection
 
       if active_record_collection?
-        self.total_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_total_count").first['count'] rescue 1)
-
         col = table_tool.order(col)
         col = table_tool.search(col)
 
         if table_tool.search_terms.present? && array_tool.search_terms.blank?
-          self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_filtered_count").first['count'] rescue 1)
+          self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_filtered_count").first['count'] rescue 1).to_i
         end
-      else
-        self.total_records = col.size
       end
 
       if array_tool.search_terms.present?
@@ -400,6 +393,9 @@ module Effective
         filter = {}
       end
 
+      # This is a fix for passing filter[:selected] == false, it needs to be 'false'
+      filter[:selected] = filter[:selected].to_s unless filter[:selected].nil?
+
       case col_type # null, number, select, number-range, date-range, checkbox, text(default)
       when :belongs_to
         {

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.3.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Code and Effect