effective_datatables 4.16.2 → 4.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079ed09629f9c21a2d1e56da78d611258f57953200eba9724ee756c699db49ce'
-  data.tar.gz: 76fd2c6b7380bb02482312120c2b04ab68cd8a3e0e08c18815c838ac0f9ff58b
+  metadata.gz: 2be4e45193ceaf2f5fc2f8543cde183156ec0210d844a9603977f7b456197bf4
+  data.tar.gz: c7b437a89b3439f79b1d596936efb1be6401d8c12a4ffb844aecf2150d59772d
 SHA512:
-  metadata.gz: 05ea2263405fbd49445e82e14240405794d14b86caf704115584f5de46ca1ba5fc8b685c2de66b612f3b540c80148ad6257cd3352a63e56bd02f6f303058af3b
-  data.tar.gz: cde3bf3b0bb9c8aa21b5b877da243c01069dcea07ca9e30d4b4e342839b66d7ecf5f1fe7087dbfbf5dc412d20a991b810171dea3c340934cf3da354b9f35e9d5
+  metadata.gz: d8601ecaaea61c41cdb6375e0f6b6521593326596c620142a7ea5752030dc3b9957453c1c1c3b82d6de54e21d8811fb6bad64cebef629cc6f6d064d86d8aec29
+  data.tar.gz: 0f55d6478da0bb096d493c898dc34a606b85f7b8b4009ff35bc5a58e5bc0a34c7828fe67b81fe4b4daa69f5b9f672d85e1d14787211bc6f4cf485e921d160884

data/app/assets/javascripts/dataTables/buttons/buttons.colVis.js

@@ -62,9 +62,15 @@ $.extend( DataTable.ext.buttons, {
 				columns: idx,
 				columnText: conf.columnText
 			};
-		} ).toArray();
+		})
 
-		return columns;
+    var sorted = columns.sort(function (a, b) {
+      var a = dt.settings()[0].aoColumns[a.columns].sTitle;
+      var b = dt.settings()[0].aoColumns[b.columns].sTitle;
+      return a.localeCompare(b)
+    }).toArray();
+
+    return sorted;
 	},
 
 	// Single button to toggle column visibility

data/app/helpers/effective_datatables_private_helper.rb

@@ -69,13 +69,19 @@ module EffectiveDatatablesPrivateHelper
 
     case opts[:as]
     when :belongs_to
-      opts[:resource].human_name
+      foreign_key = opts[:resource].initialized_name.try(:foreign_key).to_s.downcase
+      klass_name = opts[:resource].initialized_name.try(:class_name).to_s.downcase
+
+      if foreign_key.starts_with?(klass_name)
+        opts[:resource].human_name
+      else
+        datatable.collection_class.human_attribute_name(name)
+      end
     when :has_many
       opts[:resource].human_plural_name
     else
       datatable.collection_class.human_attribute_name(name)
     end
-
   end
 
   def datatable_search_tag(datatable, name, opts)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.16.2'.freeze
+  VERSION = '4.17.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.16.2
+  version: 4.17.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails