effective_datatables 3.3.13 → 3.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dffd38770a3af2941939b9e9270c9a0faa2b388
-  data.tar.gz: 05984e20f1fd56aa5a694f249575471481ee3c2c
+  metadata.gz: ea8489f1a21f2dd9b48a0c3fdcceb3d9c3c1b705
+  data.tar.gz: 8c5c8d254c485bd5975aca3436bb82a5e0c51299
 SHA512:
-  metadata.gz: c7025854c9eccd2dda33beb5386da2e1e0709e7e1e7d931f318143900eebc51de0fac7e0a73db6fb539ab7a07c0a7d8be751ae43e6c63e80d19694b78812615f
-  data.tar.gz: 31212703a472da510fa3075b2b2ee06b9e8867cca1571fa561deabb32440d939e1017b4539020a83631c45b81659f694161cddf12e6b696b1fd3b8674a46346f
+  metadata.gz: 108b2f1856fee2aa9e153dd1baf76f0fa4a8a8b047ac8a9a36648fe7f657e33970d38d2afed2c3b4c0529e5938361a09b5efd020de0bcc026f68e16b3986d8f4
+  data.tar.gz: f54da3d46cf77a19b0626a8d51f12b33b95cb461d8642c72bea9286b40cfe4a7a5398582bbd24d7fc7eed54a55741f475f1306914266dd093df53626f7c46b8c

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -177,6 +177,7 @@ table.dataTable > tbody > tr.child {
 // Column specific adjustments
 table.dataTable {
   td.col-price { text-align: right; }
+  td.col-decimal { text-align: right; }
   td.col-right { text-align: right; }
 
   td.col-actions {

data/app/models/effective/datatable_value_tool.rb

@@ -136,7 +136,7 @@ module Effective
           end
         when *macros, :resource
           Array(obj).any? do |resource|
-            Array(terms).any? do |term|
+            Array(term).any? do |term|
               matched = false
 
               if term.kind_of?(Integer) && resource.respond_to?(:to_param)

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

@@ -112,6 +112,10 @@ module Effective
             elsif raw
               aggregate_column(values, opts, aggregate)
             else
+              if values.all? { |v| v.kind_of?(ActiveRecord::Base) && v.respond_to?(name) }
+                values = values.map { |v| (v[name] if opts[:sql_as_column]) || v.public_send(name) }
+              end
+
               format_column(aggregate_column(values, opts, aggregate), opts)
             end || BLANK
           end.compact

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

@@ -1,6 +1,7 @@
 module Effective
   module EffectiveDatatable
     module Resource
+      AGGREGATE_SQL_FUNCTIONS = ['ARRAY_AGG(', 'AVG(', 'COUNT(', 'MAX(', 'MIN(', 'STRING_AGG(', 'SUM(']
 
       def admin_namespace?
         controller_namespace == 'admin'
@@ -74,6 +75,10 @@ module Effective
               # Anything that doesn't belong to the model or the sql table, we assume is a SELECT SUM|AVG|RANK() as fancy
               opts[:sql_as_column] = true if (resource.table && resource.column(name).blank?)
             end
+
+            if opts[:sql_column].present? && AGGREGATE_SQL_FUNCTIONS.any? { |str| opts[:sql_column].to_s.start_with?(str) }
+              opts[:sql_as_column] = true
+            end
           end
         end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.3.13'.freeze
+  VERSION = '3.3.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.3.13
+  version: 3.3.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails