effective_datatables 2.6.10 → 2.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07dc48d8a575df532cd92fd109900d5bc9ccb591
-  data.tar.gz: 752b4e40917ddf57d8b730301a2a7f64460d1158
+  metadata.gz: 86b3ee8af0712a3f48d5df489d0704f06a773500
+  data.tar.gz: 75afbb70cee77c225f37f85f0394c3390c69b927
 SHA512:
-  metadata.gz: 9c751b3b44f38a9cdd3ae975900eaf90f81b7ef7ac7c7a2ff87e6561889df45b945463fa8cbc1d68877052887a174e86444e3f9c5accff29d86fae22e2335309
-  data.tar.gz: d989255c2d7aa3fc8043085628ba32e0bc59f5bc6b7de07ffb38cda89d03d957a1ead21f7b65ae9c0161e913f553da6dc5fb6561fbe3e929eaecc85ab09e5d3e
+  metadata.gz: c7f313067e10184fc9ec6a22f758f3cbdf6a19ee1eb2bfcfffd370ccecf3f0391f874da4fe136d41e05bbbe92c30493136eea6b5d37f22568cc273223a26c4ca
+  data.tar.gz: eea4936ba94daaf4364577aeedefb330239dbaa6515f603d1b5772c1570d6cdcd0f12a445378a87634ec15f98331df7cfffc0499e17b1131dd4d4063a3341240

data/app/models/effective/datatable.rb

@@ -182,6 +182,9 @@ module Effective
       @array_tool ||= ArrayDatatableTool.new(self, table_columns.select { |_, col| col[:array_column] })
     end
 
+    # TODO
+    # Check if collection has an order() clause and warn about it
+    # Usually that will make the table results look weird.
     def active_record_collection?
       @active_record_collection ||= (collection.ancestors.include?(ActiveRecord::Base) rescue false)
     end

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

@@ -146,7 +146,7 @@ module Effective
             cols[name][:column] = sql_table.present? ? "#{quote_sql(sql_table.name)}.#{quote_sql('roles_mask')}" : name
           end
 
-          if sql_table.present? && sql_column.blank? # This is a SELECT AS column, or a JOIN column
+          if sql_table.present? && sql_column.blank? && !cols[name][:array_column] # This is a SELECT AS column, or a JOIN column
             cols[name][:sql_as_column] = true
           end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.6.10'.freeze
+  VERSION = '2.6.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.6.10
+  version: 2.6.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails