effective_datatables 3.3.10 → 3.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b71c7b87a3cf6891b8de4f83a2c1516e9b4aeb2e
-  data.tar.gz: dce5ed1209840652ce2f60dd551eb33090e6e9dc
+  metadata.gz: 0fc1f6f535deb2f4ef8f29dc9f013eaf26956a63
+  data.tar.gz: f351a8a61796370df361a1f6f347814e75e739aa
 SHA512:
-  metadata.gz: a00004b787edf69a656abdfffe5bbdf2a0a60106b539af3fe66fd374fc8a2fa3125916e6a2d25b64582f17062037727309dbbd0fc73ed689fc1453f0d546fb36
-  data.tar.gz: a291e7181d8876804dfc4ed4d1c15d122db1d3c09269effd210a314cc35e6ae1d0496788d87df86f051b16e15df88312941ff3bd438962e17eaeccfc5a8aee4e
+  metadata.gz: c47db5a645fd6bdb183f0292ca0c39a6a1d3d637f70fb51b3fab9840a071ba7c31a235a105d1b57f38b14726e97acc5b319f99bae96c74cb32626c880b7b3558
+  data.tar.gz: cad66d637de933b80244d52ac5edd4580247930113f2300a0f2ff3db3140867a6dd1928a4deadf0ed74e6be610e77453982407803bcf992e295f71b3292feb76

data/README.md

@@ -665,8 +665,6 @@ filters do
   filter :start_date, Time.zone.now-3.months, required: true
   filter :end_date, nil, parse: -> { |term| Time.zone.local(term).end_of_day }
   filter :user, current_user, as: :select, collection: User.all
-  filter :year, 2018, as: :select, collection: [2018, 2017], label: false, include_blank: false
-  filter :reports, '2018', as: :grouped_select, collection: [['Years', [['2017', '2017'], ['2018', '2018']]], ['Months', [['January', '1'], ['February', '2']]]], group_method: :last
 end
 ```
 

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

@@ -8,14 +8,19 @@ module Effective
           raise 'expected second argument to be a value' if value == :_no_value
           raise 'parse must be a Proc' if parse.present? && !parse.kind_of?(Proc)
 
+          # Merge search
+          if input_html.kind_of?(Hash) && input_html[:search].kind_of?(Hash)
+            input_html = input_html.merge(input_html[:search])
+          end
+
           datatable._filters[name.to_sym] = {
             value: value,
             as: as,
-            label: label || (label == false ? false : name.to_s.titleize),
+            label: label || name.to_s.titleize,
             name: name.to_sym,
             parse: parse,
             required: required,
-            input_html: input_html.merge({ value: value })
+            input_html: input_html
           }
         end
 

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

@@ -12,16 +12,13 @@
     - if datatable._filters.present?
       .effective-datatables-filters-inputs
         - datatable._filters.each do |name, opts|
-          = form.input name, label: opts[:label], required: false, value: datatable.state[:filter][name],
-            selected: datatable.state[:filter][name],
+          = form.input name,
+            label: opts[:label],
+            required: opts[:input_html].delete(:required),
+            value: datatable.state[:filter][name],
             as: opts[:as],
             collection: opts[:input_html].delete(:collection),
             multiple: opts[:input_html].delete(:multiple),
-            include_blank: opts[:input_html].delete(:include_blank),
-            group_method: opts[:input_html].delete(:group_method),
-            group_label_method: opts[:input_html].delete(:group_label_method),
-            value_method: opts[:input_html].delete(:value_method),
-            label_method: opts[:input_html].delete(:label_method),
             input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(opts[:input_html]),
             input_js: ({ placeholder: ''} if opts[:as] == :effective_select),
             wrapper_html: {class: 'form-group-sm'}

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.3.10'.freeze
+  VERSION = '3.3.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.3.10
+  version: 3.3.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord