effective_datatables 2.3.5 → 2.3.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/effective/array_datatable_tool.rb +22 -2
- data/lib/effective_datatables/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 022ddc333f2945576261e958430917ca61e29d27
|
|
4
|
+
data.tar.gz: b86a1bbf0e7f32f43c58b4ebb01e0039bb56cebb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7958e4f399cc56760e6d5d26d2dff531a1ea0ed5e7ed46c7ddf435f2215fc5cbb79001d4f1ef5365979d7017b5d08c0975cc6aa8167ed9c2fa7834b6a98e3541
|
|
7
|
+
data.tar.gz: d0012877e50103193bdac382da5e6d13661f38d45cf2af0052e92167771c63809c2d2a5014124f5d1b611f2c20da0709981b1a97e097645f29dbebe6b799b4f7
|
|
@@ -23,9 +23,29 @@ module Effective
|
|
|
23
23
|
index = display_index(order_column)
|
|
24
24
|
|
|
25
25
|
if order_direction == 'ASC'
|
|
26
|
-
collection.sort!
|
|
26
|
+
collection.sort! do |x, y|
|
|
27
|
+
if (x[index] && y[index])
|
|
28
|
+
x[index] <=> y[index]
|
|
29
|
+
elsif x[index]
|
|
30
|
+
-1
|
|
31
|
+
elsif y[index]
|
|
32
|
+
1
|
|
33
|
+
else
|
|
34
|
+
0
|
|
35
|
+
end
|
|
36
|
+
end
|
|
27
37
|
else
|
|
28
|
-
collection.sort!
|
|
38
|
+
collection.sort! do |x, y|
|
|
39
|
+
if (x[index] && y[index])
|
|
40
|
+
y[index] <=> x[index]
|
|
41
|
+
elsif x[index]
|
|
42
|
+
1
|
|
43
|
+
elsif y[index]
|
|
44
|
+
-1
|
|
45
|
+
else
|
|
46
|
+
0
|
|
47
|
+
end
|
|
48
|
+
end
|
|
29
49
|
end
|
|
30
50
|
end
|
|
31
51
|
|
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: 2.3.
|
|
4
|
+
version: 2.3.6
|
|
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: 2016-04-
|
|
11
|
+
date: 2016-04-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|