effective_datatables 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23149a11f5d924187b057923850c1883278bed56
-  data.tar.gz: af8cebc2b8ed50a9c1ab9bf3ea9d76a6572ef3bc
+  metadata.gz: accdc49e5adcbb84639c6f04e26a080544bd8f4b
+  data.tar.gz: 763d0016579e806d0d77b54a62caedcbf049b6df
 SHA512:
-  metadata.gz: b9f8b343da4185651b0e55e4d2b72ded088cb360962d31e71da5886000c26403046c69c2c0c4445c71900adf42cf00c879393823fe66b0592cbaa63286c656d5
-  data.tar.gz: b564536eb290f27fdf2721dd37902dcfa441a7224eab2703edc27d24037dbe1f1674597df8fe3baa2af808d755d0c0b9424b93b36e6817e4c16d65143c80aa44
+  metadata.gz: 63c01f326d91d3eac11bf530291e193f44e96b418ad2162e54a636b0cba91b4911b751c3389221841470a79ba382f4662a799fc6c133769642fe915088c3e8e4
+  data.tar.gz: 1690d18d9e6656b9ddf3dfdeb4351203355fc6c188434dcfde87a0cc7d0d7de5a1a7690f97ec1198f3fb89dc426b00a9a0b7cf49e8cb3f3c7cc0850a3fe7af3d

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

@@ -35,6 +35,11 @@ table.dataTable thead th {
   .form-group { margin-bottom: 0px; font-weight: normal; }
 }
 
+table.dataTable td ul {
+  list-style: none;
+  padding-left: 0;
+}
+
 // Sorting disabled
 table.dataTable.sort-hidden thead .sorting { background-image: none; }
 table.dataTable.sort-hidden thead .sorting_asc { background-image: none; }

data/app/helpers/effective_datatables_helper.rb

@@ -78,8 +78,6 @@ module EffectiveDatatablesHelper
         group_method: opts[:filter][:group_method] || :last,
         input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { placeholder: (opts[:label] || name.titleize) }
-    else
-      content_tag(:p, opts[:label] || name)
     end
   end
 

data/app/models/effective/active_record_datatable_tool.rb

@@ -24,7 +24,7 @@ module Effective
       before = ''; after = ''
 
       if postgres?
-        after = ' NULLS LAST'
+        after = " NULLS #{order_direction == 'DESC' ? 'FIRST' : 'LAST' }"
       elsif mysql?
         before = "ISNULL(#{column}), "
       end
@@ -54,7 +54,11 @@ module Effective
       case table_column[:type]
       when :string, :text
         if (table_column[:filter][:type] == :select && table_column[:filter][:fuzzy] != true) || sql_op != :where
-          collection.public_send(sql_op, "#{column} = :term", term: term)
+          if ['null', 'nil', nil].include?(term)
+            collection.public_send(sql_op, "#{column} = :term OR #{column} IS NULL", term: term)
+          else
+            collection.public_send(sql_op, "#{column} = :term", term: term)
+          end
         else
           collection.public_send(sql_op, "#{column} #{ilike} :term", term: "%#{term}%")
         end

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

@@ -99,7 +99,7 @@ module Effective
             cols[name][:type] = :effective_roles
           end
 
-          if sql_table.present? && sql_column.blank? # This is a SELECT AS column
+          if sql_table.present? && sql_column.blank? # This is a SELECT AS column, or a JOIN column
             cols[name][:sql_as_column] = true
           end
 
@@ -131,8 +131,15 @@ 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?
 
+        # Allow values or collection to be used interchangeably
+        if filter.key?(:collection)
+          filter[:values] ||= filter[:collection]
+        end
+
         # If you pass values, just assume it's a select
-        filter[:type] ||= :select if filter.key?(:values) && col_type != :belongs_to_polymorphic
+        if filter.key?(:values) && col_type != :belongs_to_polymorphic
+          filter[:type] ||= :select
+        end
 
         # Check if this is an aggregate column
         if ['SUM(', 'COUNT(', 'MAX(', 'MIN(', 'AVG('].any? { |str| sql_column.include?(str) }

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

@@ -141,6 +141,10 @@ module Effective
             next if value == nil || value == BLANK || opts[:visible] == false
             next if opts[:block] || opts[:partial] || opts[:proc]
 
+            if opts[:sql_as_column]
+              row[index] = value.to_s
+            end
+
             case opts[:type]
             when :belongs_to, :belongs_to_polymorphic
               row[index] = value.to_s

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.2.2'.freeze
+  VERSION = '2.2.3'.freeze
 end

metadata

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