effective_datatables 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481368c9668039fa39e34afcd05211b5bd1333c7
-  data.tar.gz: 794be0c0007b127b18ccd17ccf924117a89bc693
+  metadata.gz: 6d159cc1ddb97f8595ea993ca8e538b412577cc3
+  data.tar.gz: 0bb7015ca673162be2f4b9557a1e0f444ffa139a
 SHA512:
-  metadata.gz: 83f42d5c775dea0bfce70df090aa0e7e4de4b2ce3383f7ae2895c55c89cef24c774895a439da106d27cdc1140e288778079f5d8baf46933673bb68df4ca5f225
-  data.tar.gz: 8f03c3c27feae7225730a7428c1e3d37795557540be63880c6686bdbbf98c6e5f5a0b3e418b9dc59cb22e70fad5359e81b5b98ba6a52ddc0441c180aada334ca
+  metadata.gz: 6c770a91c59e1801c4e02b2676e43c2063cdb82880d37620458c6bbaaaf531ecc050461900d38e045707828cac7c87a09d635aa0604b48b2134de256b7063377
+  data.tar.gz: 1d93556e75ba8f1d90ff3fdd9bc8ad668c0623afc81f3331117526f66938f00f10e1bd5e178b8745a994dc2f048db6724c66e865f8164abd493d98c074dbfff8

data/app/helpers/effective_datatables_helper.rb

@@ -54,23 +54,26 @@ module EffectiveDatatablesHelper
   def datatable_header_filter(form, name, value, opts)
     return render(partial: opts[:header_partial], locals: {form: form, name: (opts[:label] || name), column: opts}) if opts[:header_partial].present?
 
+    include_blank = opts[:filter].key?(:include_blank) ? opts[:filter][:include_blank] : (opts[:label] || name.titleize)
+    placeholder = opts[:filter].key?(:placeholder) ? opts[:filter][:placeholder] : (opts[:label] || name.titleize)
+
     case opts[:filter][:as]
     when :string, :text, :number
       form.input name, label: false, required: false, value: value,
         as: :string,
-        placeholder: (opts[:label] || name),
+        placeholder: placeholder,
         input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
     when :date
       form.input name, label: false, required: false, value: value,
         as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_date_picker) ? :effective_date_picker : :string),
-        placeholder: (opts[:label] || name),
+        placeholder: placeholder,
         input_group: false,
         input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { useStrict: true, keepInvalid: true }
     when :datetime
       form.input name, label: false, required: false, value: value,
         as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_date_time_picker) ? :effective_date_time_picker : :string),
-        placeholder: (opts[:label] || name),
+        placeholder: placeholder,
         input_group: false,
         input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { useStrict: true, keepInvalid: true } # Keep invalid format like "2015-11" so we can still filter by year, month or day
@@ -80,22 +83,22 @@ module EffectiveDatatablesHelper
         collection: opts[:filter][:collection],
         selected: opts[:filter][:selected],
         multiple: opts[:filter][:multiple] == true,
-        include_blank: (opts[:label] || name.titleize),
+        include_blank: include_blank,
         input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
-        input_js: { placeholder: (opts[:label] || name.titleize) }
+        input_js: { placeholder: placeholder }
     when :grouped_select
       form.input name, label: false, required: false, value: value,
         as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_select) ? :effective_select : :grouped_select),
         collection: opts[:filter][:collection],
         selected: opts[:filter][:selected],
         multiple: opts[:filter][:multiple] == true,
-        include_blank: (opts[:label] || name.titleize),
+        include_blank: include_blank,
         grouped: true,
         polymorphic: opts[:filter][:polymorphic] == true,
         group_label_method: opts[:filter][:group_label_method] || :first,
         group_method: opts[:filter][:group_method] || :last,
         input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
-        input_js: { placeholder: (opts[:label] || name.titleize) }
+        input_js: { placeholder: placeholder }
     when :bulk_actions_column
       form.input name, label: false, required: false, value: nil,
         as: :boolean,

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.4.4'.freeze
+  VERSION = '2.4.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails