effective_datatables 4.3.20 → 4.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd07e900a976b859296be599b528999fc3a405c
-  data.tar.gz: 30208e6488de5c84b9311409f98f04a0c718811b
+  metadata.gz: d16abc968c44876025dde5fcd633faf328642df6
+  data.tar.gz: 2c4f38ae922eb00e4dc5dbf46f9fb843dd3de926
 SHA512:
-  metadata.gz: d2c242866ddec34922c6720f5794e6efe6e1e866c7d4874540f4fd7b05d67a5a6de87ab54a5203e7f05c889da5e81a13a717f46a012ab54d3a5bc7b5079dcd7e
-  data.tar.gz: d9996dfc30d2e7c0ac9f8d81da9fcb782224e88e7d0c4468be7c0d6256d24a1391fa4bef2a922190e1be5e4f6c69f2ee064d293094a8279d2ce8fbdbcf0b69b5
+  metadata.gz: f22ddb2a8b4d015a65804a6f245652fb1f204f36878c898c786f1bbd0c62d8c886630097e27ffd95163a0abe2e82ac3c9fb992afdaa0e56fcc90a2d7d5d9d97c
+  data.tar.gz: 3da4b7eab6631e79dd1d7fe8e25b4d2cb8bb0e7baf7414389f0a528321c60454a254f030050b9377ac2f522a562d946ff0ee65797cc47bfb2b6c47e58b737728

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

@@ -8,7 +8,7 @@ $(document).on 'ajax:beforeSend', '.dataTables_wrapper .col-actions', (e, xhr, s
 
   return true if ('' + $action.data('inline')) == 'false'
 
-  $params =  $.param({_datatable_id: $table.attr('id'), _datatable_cookie: $table.data('cookie') })
+  $params =  $.param({_datatable_id: $table.attr('id'), _datatable_cookie: $table.data('cookie'), _datatable_action: true })
   settings.url += (if settings.url.indexOf('?') == -1 then '?' else '&') + $params
 
   if $action.closest('.effective-datatables-inline-row').length > 0
@@ -161,9 +161,8 @@ refreshDatatables = ($source) ->
   $('table.dataTable.initialized').each ->
     $table = $(this)
 
-    if EffectiveForm.remote_form_refresh_datatables.find((id) -> $table.attr('id').startsWith(id) || id == 'all') && $table != $except
-      if $table != $source
-        $table.DataTable().draw()
+    if EffectiveForm.remote_form_refresh_datatables.find((id) -> $table.attr('id').startsWith(id) || id == 'all')
+      $table.DataTable().draw() if $table != $source
 
 # Cancel button clicked. Blow away new tr, or restore edit tr
 # No data will have changed at this point

data/app/models/effective/datatable.rb

@@ -79,8 +79,8 @@ module Effective
 
       # Figure out the class, and if it's activerecord, do all the resource discovery on it
       load_resource!
-      load_resource_search!
       apply_belongs_to_attributes!
+      load_resource_search!
 
       # Check everything is okay
       validate_datatable!

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

@@ -18,7 +18,10 @@ module Effective
 
         # Apply column searching
         col = column_tool.search(col)
-        @display_records = column_tool.size(col) unless value_tool.searched.present?
+
+        unless value_tool.searched.present? || (column_tool.scoped.blank? && column_tool.searched.blank?)
+          @display_records = column_tool.size(col)
+        end
 
         # Apply column ordering
         col = column_tool.order(col)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.20'.freeze
+  VERSION = '4.3.21'.freeze
 end

metadata

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