effective_datatables 4.8.0 → 4.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5a9a4233ee452020c92387b3bb140eac9df58bd52548c55a2eb41881c731f67
-  data.tar.gz: f738131e50148095ea9c1cee3b0f68911d4b2a4f1815b7d5aa6445ec4d849a49
+  metadata.gz: c6a77322f8b3da0b36839982abeb4acf9d95dace45fbef7f5d6c070dfcf4a7b5
+  data.tar.gz: a577c815d43b2a7fac94a295608fb3c58b89498cdcf9a8786efcb1a914efcf1a
 SHA512:
-  metadata.gz: 2279b8c6b0f72dc5427a2d0cc876ee83021806a3152d325edcccbaf8532dd65de27c1a8275320a306568790a60965d6235ee585e4bba41c1337148568df62d51
-  data.tar.gz: a7e514c7caf226a633fbd5d6098df1241b38336343fc9d6927f3bab07419d56300c06c4cecab752ed4a43819f9f6946c820cff5af7e0b25c317922a06625155e
+  metadata.gz: 3b2c6a6ccd7736bf2acd6b6d3ea3fa413a39af920fc9d65243979ac5a354b2c861d15771f7c48b2f7e7ae9e12a7fb49b3852238f8705841a25969484871d9b7c
+  data.tar.gz: 6462f1def33b70d288dcf9fdded153b2e067b95df08a60d163ae81c5195eecceaa7e389bb8b02be4d2e0b368749a37dcc8c21ed74e9eadf8e1a26d0867f76f9d

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

@@ -5,6 +5,9 @@ initializeDataTables = (target) ->
     buttons_export_columns = options['buttons_export_columns'] || ':not(.col-actions)'
     reorder = datatable.data('reorder')
 
+    if datatable.data('inline') && datatable.closest('form').length > 0
+      console.error('inline datatable cannot work inside a form')
+
     if options['buttons'] == false
       options['buttons'] = []
 
@@ -172,7 +175,9 @@ initializeDataTables = (target) ->
 
       value = $input.val()
 
-      if value.startsWith('"') && value.endsWith('"')
+      if Array.isArray(value)
+        # Nothing
+      else if value.startsWith('"') && value.endsWith('"')
         value = value.substring(1, value.length-1)
       else
         value = $.trim(value)

data/app/assets/stylesheets/dataTables/dataTables.bootstrap4.scss

@@ -162,9 +162,7 @@ div.dataTables_scrollFoot > .dataTables_scrollFootInner > table {
     text-align: center;
   }
 }
-table.dataTable.table-sm > thead > tr > th {
-  padding-right: 20px;
-}
+
 table.dataTable.table-sm .sorting:before,
 table.dataTable.table-sm .sorting_asc:before,
 table.dataTable.table-sm .sorting_desc:before {

data/app/helpers/effective_datatables_private_helper.rb

@@ -149,6 +149,8 @@ module EffectiveDatatablesPrivateHelper
     elsif as == :boolean
       collection ||= [true, false].map { |value| [t("effective_datatables.boolean_#{value}"), value] }
       form.public_send(:select, name, collection, options) # boolean
+    elsif as == :string
+      form.public_send(:text_field, name, options)
     elsif form.respond_to?(as)
       form.public_send(as, name, options) # check_box, text_area
     else

data/app/models/effective/effective_datatable/dsl/filters.rb

@@ -20,7 +20,7 @@ module Effective
             elsif value != nil
               Effective::Attribute.new(value).type
             end
-          ) || :text
+          ) || :string
 
           datatable._filters[name.to_sym] = {
             value: value,

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

@@ -4,7 +4,7 @@ module Effective
       AGGREGATE_SQL_FUNCTIONS = ['ARRAY_AGG(', 'AVG(', 'COUNT(', 'MAX(', 'MIN(', 'STRING_AGG(', 'SUM(']
 
       def admin_namespace?
-        controller_namespace == 'admin'
+        [:admin, 'admin'].include?(controller_namespace)
       end
 
       def controller_namespace
@@ -200,6 +200,7 @@ module Effective
 
       def load_resource_belongs_tos!
         return unless active_record_collection?
+        return unless @_collection_apply_belongs_to 
 
         changed = attributes.select do |attribute, value|
           attribute = attribute.to_s
@@ -210,7 +211,7 @@ module Effective
           next unless columns[associated]
 
           if columns[associated][:as] == :belongs_to
-            if @_collection_apply_belongs_to && !@_collection.where_values_hash.include?(attribute)
+            unless @_collection.where_values_hash.include?(attribute)
               @_collection = @_collection.where(attribute => value)
             end
 
@@ -218,10 +219,8 @@ module Effective
           elsif columns[associated][:as] == :belongs_to_polymorphic
             associated_type = attributes["#{associated}_type".to_sym] || raise("Expected #{associated}_type attribute to be present when #{associated}_id is present on a polymorphic belongs to")
 
-            if @_collection_apply_belongs_to
-              if !@_collection.where_values_hash.include?(attribute) && !@_collection.where_values_hash.include?("#{associated}_type")
-                @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
-              end
+            unless @_collection.where_values_hash.include?(attribute) || @_collection.where_values_hash.include?("#{associated}_type")
+              @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
             end
 
             columns.delete(associated)

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

@@ -198,7 +198,7 @@ module Effective
       def parse_filter_value(filter, value)
         return filter[:parse].call(value) if filter[:parse]
         return nil if value.blank? && !filter[:required]
-        Effective::Attribute.new(filter[:value]).parse(value, name: filter[:name])
+        Effective::Attribute.new(filter[:as] || filter[:value] || :string).parse(value, name: filter[:name])
       end
 
       def cookie_state_params

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

@@ -1,4 +1,4 @@
 - Array(resource.public_send(column[:name])).each do |file|
   .col-resource_item
     - title = [file.content_type, number_to_human_size(file.byte_size)].map(&:presence).compact
-    = link_to(file.filename, url_for(file), title: title)
+    = link_to(file.filename, url_for(file), title: title, target: '_blank')

data/config/effective_datatables.rb

@@ -35,7 +35,7 @@ EffectiveDatatables.setup do |config|
   config.save_state = true
 
   # Configure the _effective_dt cookie.
-  config.cookie_max_size = 2000       # String size. Final byte size is about 1.5 times bigger, after rails signs it
+  config.cookie_max_size = 1500       # String size. Final byte size is about 1.5 times bigger, after rails signs it
   config.cookie_domain = :all         # Should usually be :all
   config.cookie_tld_length = nil      # Leave nil to autodetect, or set to probably 2
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.8.0'.freeze
+  VERSION = '4.8.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.5
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,7 +178,7 @@ homepage: https://github.com/code-and-effect/effective_datatables
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -193,8 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord
   or Array collection as well as post-rendered content displayed as a frontend jQuery