effective_datatables 2.6.10 → 2.6.11
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 86b3ee8af0712a3f48d5df489d0704f06a773500
|
4
|
+
data.tar.gz: 75afbb70cee77c225f37f85f0394c3390c69b927
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c7f313067e10184fc9ec6a22f758f3cbdf6a19ee1eb2bfcfffd370ccecf3f0391f874da4fe136d41e05bbbe92c30493136eea6b5d37f22568cc273223a26c4ca
|
7
|
+
data.tar.gz: eea4936ba94daaf4364577aeedefb330239dbaa6515f603d1b5772c1570d6cdcd0f12a445378a87634ec15f98331df7cfffc0499e17b1131dd4d4063a3341240
|
@@ -182,6 +182,9 @@ module Effective
|
|
182
182
|
@array_tool ||= ArrayDatatableTool.new(self, table_columns.select { |_, col| col[:array_column] })
|
183
183
|
end
|
184
184
|
|
185
|
+
# TODO
|
186
|
+
# Check if collection has an order() clause and warn about it
|
187
|
+
# Usually that will make the table results look weird.
|
185
188
|
def active_record_collection?
|
186
189
|
@active_record_collection ||= (collection.ancestors.include?(ActiveRecord::Base) rescue false)
|
187
190
|
end
|
@@ -146,7 +146,7 @@ module Effective
|
|
146
146
|
cols[name][:column] = sql_table.present? ? "#{quote_sql(sql_table.name)}.#{quote_sql('roles_mask')}" : name
|
147
147
|
end
|
148
148
|
|
149
|
-
if sql_table.present? && sql_column.blank? # This is a SELECT AS column, or a JOIN column
|
149
|
+
if sql_table.present? && sql_column.blank? && !cols[name][:array_column] # This is a SELECT AS column, or a JOIN column
|
150
150
|
cols[name][:sql_as_column] = true
|
151
151
|
end
|
152
152
|
|
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.6.
|
4
|
+
version: 2.6.11
|
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-09-
|
11
|
+
date: 2016-09-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|