effective_datatables 4.30.1 → 4.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101202eb8e7251895835506090dbee19f994e4db1bed1ba263f8bed9226c45de
-  data.tar.gz: c10bbed1cddf86a46782924d42eb1a081eb4fef692a9eb1a4ab9e76520522c4a
+  metadata.gz: 44820c2466c8503adb80773c5bc282203a8c1a7be41d931bea08413b2c980644
+  data.tar.gz: e450c9c54b19fe4c5aa1619f8ee19a893796c1ffb6b88e66be3016feecb2a01f
 SHA512:
-  metadata.gz: ac57919edf6575dc47ed971f8cec6d60afa6783095f2098cafa8d89ba43cad4283c87bafcef402880fdac90a5d91c2b00a887753da11cbbf77b82f8e9325be23
-  data.tar.gz: 505c45e8a0034dda6a99120f65cabf601886627bac22c23148cc4cd7fc217c1c08235ba92d65522064eeaa014c7c18a179ca9d711585093309cbb1897d956bdb
+  metadata.gz: 79964cf5b2036ca752a16a2529bdc79f37189990c3296a285ae05792a5218a58af426d9f0165503303caacdbcda98c8b309b50c152debf7ac0ec203c5b20375c
+  data.tar.gz: 7783cf0f17017eeba8c143138a1d535ed06bfa85c7cb41c73dbf76523d74243f18842b8bb6042c45afbdd1d9aa6d9334bded97d7e2e2e06b4aa1ff4161c0bc12

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

@@ -6,7 +6,10 @@ getFilterParams = ->
   params = {}
 
   if $form.length > 0
-    params['scope'] = $form.find("input[name='filters[scope]']:checked").val() || ''
+    params['scope'] = $form.find("input[name='filters[scope]']:checked").val()
+    params['scope'] ||= $form.find("input[name='filters[scope]']:not([type='hidden'])").first().val()
+    params['scope'] ||= 'effective_datatables_empty_scope'
+
     params['filter'] = {}
 
     $form.find("select,textarea,input:enabled:not([type=submit])").each ->

data/app/controllers/effective/datatables_controller.rb

@@ -73,11 +73,13 @@ module Effective
           if new_index > old_index
             @datatable.collection.where("#{attribute} > ? AND #{attribute} <= ?", old_index, new_index).update_all("#{attribute} = #{attribute} - 1")
             @resource.update_column(attribute, new_index)
+            @resource.touch
           end
 
           if old_index > new_index
             @datatable.collection.where("#{attribute} >= ? AND #{attribute} < ?", new_index, old_index).update_all("#{attribute} = #{attribute} + 1")
             @resource.update_column(attribute, new_index)
+            @resource.touch
           end
         end
 

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

@@ -73,7 +73,11 @@ module Effective
 
       def load_filters!
         state[:filter] = _filters.inject({}) { |h, (name, opts)| h[name] = opts[:value]; h }
-        state[:scope] = _scopes.find { |_, opts| opts[:default] }.try(:first) || _scopes.keys.first
+        state[:scope] = initial_scope()
+      end
+
+      def initial_scope
+        _scopes.find { |_, opts| opts[:default] }.try(:first) || _scopes.keys.first
       end
 
       def load_filter_params!
@@ -112,7 +116,7 @@ module Effective
           state[:order_index] = params[:order]['0'][:column].to_i
         end
 
-        state[:scope] = _scopes.keys.find { |name| params[:scope] == name.to_s }
+        state[:scope] = _scopes.keys.find { |name| params[:scope] == name.to_s } || initial_scope()
         state[:start] = params[:start].to_i
 
         state[:search] = {}

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.30.1'.freeze
+  VERSION = '4.31.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.30.1
+  version: 4.31.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails