effective_datatables 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7737d3c09cfab493da58775899fcfcec9cebf6e
-  data.tar.gz: 07baaea95de4d129716ec3b0c949c3adf427c93e
+  metadata.gz: 8936f9d6cfd2f9ca5a02c280c4f388526429dc15
+  data.tar.gz: 35401b2a9625a6f6160401d9c6efb311f29d2321
 SHA512:
-  metadata.gz: a298d125254e19d5450ecdf719b0a96246be4b2ced78f2806ba5066996c0bfab1957555b268c2a28069ebd769d7754df962d5b35a6eb09992330504d43190722
-  data.tar.gz: 9d4f06230ed4ecbf2e461afe72fcc5ed1f32eba2599ef99928b0293b335a0cdcd689d0ed39b3766c7069a0e2ac949d975c5df659d8085d9233dbede56370ff82
+  metadata.gz: e10681215022737bd36e39088b505365873a0ea63f3a419771579f7832a6b81fde1edc81f8601db1af7dce940c01a6b12b196f90eac880fbc730e4d6d1d5fbdb
+  data.tar.gz: d243ff06c93761d84146fe39263db11ac0bd3665664da926d676e723541b7d153365ba59106c6ea1feafcf56d271b00bddb971c7e0c4b9a81c1f1a4a9be8495a

data/app/assets/javascripts/effective_datatables/initialize.js.coffee.erb

@@ -86,6 +86,10 @@ initializeDataTables = ->
       #  leftColumns: 2
       # )
 
+      # Apply EffectiveFormInputs to the Show x per page dropdown
+      if datatable.data('effective-form-inputs')
+        table.closest('.dataTables_wrapper').find('.dataTables_length select').select2()
+
       new $.fn.dataTable.ColReorder(table)
 
 $ -> initializeDataTables()

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

@@ -51,6 +51,8 @@ module Effective
           cols[name][:visible] = true if cols[name][:visible].nil?
 
           # Type
+          cols[name][:type] ||= cols[name][:as]  # Use as: or type: interchangeably
+
           cols[name][:type] ||= (
             if belong_tos.key?(name)
               :belongs_to
@@ -115,6 +117,9 @@ module Effective
         # This is a fix for passing filter[:selected] == false, it needs to be 'false'
         filter[:selected] = filter[:selected].to_s unless filter[:selected].nil?
 
+        # If you pass values, just assume it's a select
+        filter[:type] ||= :select if filter.key?(:values)
+
         # Check if this is an aggregate column
         if ['SUM(', 'COUNT(', 'MAX(', 'MIN(', 'AVG('].any? { |str| sql_column.include?(str) }
           filter[:sql_operation] = :having

data/app/views/effective/datatables/_datatable.html.haml

@@ -17,7 +17,8 @@
       'display-entries' => datatable.display_entries,
       'display-records' => (datatable.to_json[:recordsFiltered] || 0),
       'total-records' => (datatable.to_json[:recordsTotal] || 0),
-      'column-classes' => datatable_column_classes(datatable)
+      'column-classes' => datatable_column_classes(datatable),
+      'effective-form-inputs' => defined?(EffectiveFormInputs)
     }
   }
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.1.3'.freeze
 end

metadata

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