effective_datatables 3.3.11 → 3.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fc1f6f535deb2f4ef8f29dc9f013eaf26956a63
-  data.tar.gz: f351a8a61796370df361a1f6f347814e75e739aa
+  metadata.gz: 0c6f07911418dbf41dd99b59319b024890f069c7
+  data.tar.gz: 95a408a68bd5c64c3e8e8ca7d19df6fc9e08fbb4
 SHA512:
-  metadata.gz: c47db5a645fd6bdb183f0292ca0c39a6a1d3d637f70fb51b3fab9840a071ba7c31a235a105d1b57f38b14726e97acc5b319f99bae96c74cb32626c880b7b3558
-  data.tar.gz: cad66d637de933b80244d52ac5edd4580247930113f2300a0f2ff3db3140867a6dd1928a4deadf0ed74e6be610e77453982407803bcf992e295f71b3292feb76
+  metadata.gz: fd69b86ef935ea26ea7fe2a90593f10e2eb93457b9475b608daee0c814b6544b1eb798ec446551fa39f6b8978ec1f8bc7de97dbacf57c9f18a82be7fae4fccaa
+  data.tar.gz: 124632871b6345b24c7fb59bd3870e8048ea4ceb7d4edd99b13f8a442c3eb898f45dd08278d28b67bb38de410adbcae7f73b26fc6fd84a8bac5fefee29cf29a6

data/README.md

@@ -665,6 +665,8 @@ 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

@@ -16,11 +16,11 @@ module Effective
           datatable._filters[name.to_sym] = {
             value: value,
             as: as,
-            label: label || name.to_s.titleize,
+            label: label || (label == false ? false : name.to_s.titleize),
             name: name.to_sym,
             parse: parse,
             required: required,
-            input_html: input_html
+            input_html: input_html.merge({ value: value })
           }
         end
 

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

@@ -16,9 +16,15 @@
             label: opts[:label],
             required: opts[:input_html].delete(:required),
             value: datatable.state[:filter][name],
+            selected: 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.11'.freeze
+  VERSION = '3.3.12'.freeze
 end

metadata

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