effective_datatables 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7eefb3761460fbc53151e62474a0e0f6ded1bb6
-  data.tar.gz: 28c135a1080fb09b617dce2812c419fb86c9fe66
+  metadata.gz: be50e832316ab6b4f88107a1154d7663f4c9ee37
+  data.tar.gz: 8e056de000c513e88fb81eb1c36e32bd7e59fdfc
 SHA512:
-  metadata.gz: 86a487b725b6d7d5a83716d4401f291229f6922f5079630855afa9561a86d7d794011e9e83bf3725d12dd4eafc892fbc51cc968283850937908423ff18316dfe
-  data.tar.gz: c9be60a7ab07f40c056ae15871efd1a8347a934efa2df02f4f2ee5a181693c4f946a40135692f3fe747bb8392c4a0e55c09282720e658b25ae1c3668823a0105
+  metadata.gz: 93f84a969b61dec2417dc810d8f777c76457f5b350e1192e6ab3bc0d0082d361c275275a3f56fc8d5ba2320ed1c16d91f9745ba4a66a9952fef433a4f5131839
+  data.tar.gz: 6c1076d1f1dea6356589a1f51bc095d9393acaed072cd3b0c4fa8b0eceb0a97324b2eaeb046e74a9c01f4be024d980f6169b9cd0bfda63dc9bb3e304808a0a9a

data/app/models/effective/active_record_datatable_tool.rb

@@ -20,10 +20,14 @@ module Effective
     def order(collection)
       return collection if order_column.blank?
 
+      column = order_column[:column]
+
       if [:string, :text].include?(order_column[:type]) && order_column[:sql_as_column] != true
-        collection.order("COALESCE(#{order_column[:column]}, '') #{order_direction}")
+        collection.order("COALESCE(#{column}, '') #{order_direction}")
+      elsif order_column[:type] == :belongs_to_polymorphic
+        collection.order("(#{column.sub('_id"', '_type"')}, #{column}) #{order_direction} NULLS LAST")
       else
-        collection.order("#{order_column[:column]} #{order_direction} NULLS LAST")
+        collection.order("#{column} #{order_direction} NULLS LAST")
       end
     end
 

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

@@ -73,8 +73,8 @@ module Effective
 
           cols[name][:class] = "col-#{cols[name][:type]} col-#{name} #{cols[name][:class]}".strip
 
-          # We can't easily sort these fields
-          if cols[name][:type] == :has_many || cols[name][:type] == :belongs_to_polymorphic
+          # We can't really sort a HasMany field
+          if cols[name][:type] == :has_many
             cols[name][:sortable] = false
           end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.5'.freeze
+  VERSION = '2.1.6'.freeze
 end

metadata

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