effective_datatables 4.16.2 → 4.17.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '079ed09629f9c21a2d1e56da78d611258f57953200eba9724ee756c699db49ce'
4
- data.tar.gz: 76fd2c6b7380bb02482312120c2b04ab68cd8a3e0e08c18815c838ac0f9ff58b
3
+ metadata.gz: 2be4e45193ceaf2f5fc2f8543cde183156ec0210d844a9603977f7b456197bf4
4
+ data.tar.gz: c7b437a89b3439f79b1d596936efb1be6401d8c12a4ffb844aecf2150d59772d
5
5
  SHA512:
6
- metadata.gz: 05ea2263405fbd49445e82e14240405794d14b86caf704115584f5de46ca1ba5fc8b685c2de66b612f3b540c80148ad6257cd3352a63e56bd02f6f303058af3b
7
- data.tar.gz: cde3bf3b0bb9c8aa21b5b877da243c01069dcea07ca9e30d4b4e342839b66d7ecf5f1fe7087dbfbf5dc412d20a991b810171dea3c340934cf3da354b9f35e9d5
6
+ metadata.gz: d8601ecaaea61c41cdb6375e0f6b6521593326596c620142a7ea5752030dc3b9957453c1c1c3b82d6de54e21d8811fb6bad64cebef629cc6f6d064d86d8aec29
7
+ data.tar.gz: 0f55d6478da0bb096d493c898dc34a606b85f7b8b4009ff35bc5a58e5bc0a34c7828fe67b81fe4b4daa69f5b9f672d85e1d14787211bc6f4cf485e921d160884
@@ -62,9 +62,15 @@ $.extend( DataTable.ext.buttons, {
62
62
  columns: idx,
63
63
  columnText: conf.columnText
64
64
  };
65
- } ).toArray();
65
+ })
66
66
 
67
- return columns;
67
+ var sorted = columns.sort(function (a, b) {
68
+ var a = dt.settings()[0].aoColumns[a.columns].sTitle;
69
+ var b = dt.settings()[0].aoColumns[b.columns].sTitle;
70
+ return a.localeCompare(b)
71
+ }).toArray();
72
+
73
+ return sorted;
68
74
  },
69
75
 
70
76
  // Single button to toggle column visibility
@@ -69,13 +69,19 @@ module EffectiveDatatablesPrivateHelper
69
69
 
70
70
  case opts[:as]
71
71
  when :belongs_to
72
- opts[:resource].human_name
72
+ foreign_key = opts[:resource].initialized_name.try(:foreign_key).to_s.downcase
73
+ klass_name = opts[:resource].initialized_name.try(:class_name).to_s.downcase
74
+
75
+ if foreign_key.starts_with?(klass_name)
76
+ opts[:resource].human_name
77
+ else
78
+ datatable.collection_class.human_attribute_name(name)
79
+ end
73
80
  when :has_many
74
81
  opts[:resource].human_plural_name
75
82
  else
76
83
  datatable.collection_class.human_attribute_name(name)
77
84
  end
78
-
79
85
  end
80
86
 
81
87
  def datatable_search_tag(datatable, name, opts)
@@ -1,3 +1,3 @@
1
1
  module EffectiveDatatables
2
- VERSION = '4.16.2'.freeze
2
+ VERSION = '4.17.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_datatables
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.16.2
4
+ version: 4.17.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-03-16 00:00:00.000000000 Z
11
+ date: 2023-04-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails