sample_filter 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 154b01bf574b18c45029de09088ddf4abd4628821ff3c9801661eacaa962fe5f
-  data.tar.gz: 34f212af8708e7f904cc19936a85ba0a22271339b0d133a527aab13dde466918
+  metadata.gz: 0ab541773b85465b776280c5cd8fd65199ca78025c0e5b5b7be3d958a0f7403c
+  data.tar.gz: 97bda4dda8c9bf0b44fed93dd5a9bd897f8353c94cacf3c610fa1b7853093566
 SHA512:
-  metadata.gz: aca26778e22f062121b5f0ae3076925ebee8d3c1b0a8cf57ffe5e17759a544af3ba8d744144389b9dc1f2d575c1ffe36e057b2ece1edba14a4135b005afddf6d
-  data.tar.gz: eff500b4d578d369128a038de85850187460a7d8c2c40e038ecc818d3b1636e0425c4713274a8406f968270b956ee93a95057af8d3d90c3e5569e7afca174221
+  metadata.gz: 5c038f1dc1941f00f28fd259974a03328ab677fb441e0dacca0baa47a43f9f451cc9ffd677ebfdeebee4b109a7b6a2c77a84a8051d1e9050651f46e95c22320c
+  data.tar.gz: 201d2af2b5e5cabf9d4d7d5e84b815e5ec6c9f1a79703e5b92737a77232060b6141c31e067c3ec62bf52c23f3d5aac568cc950d77d2174be70591361f446cfe8

data/README.md

@@ -110,8 +110,6 @@ SampleFilter uses labels with I18n:
 ```yaml
 en:
   sample_filter:
-    lists:
-      all_item: all
     entity:
       fields:
         title: Title
@@ -121,22 +119,30 @@ en:
         status: Status
         confirmed: Confirmed status
         sort: Sorting
+      list:
+        kind:
+          red: Red color
+          green: Green color
+        status:
+          active: Active status
+          inactive: Inactive status
+        confirmed:
+          all_item: All
+          'true': Confirmed
+          'false': Unconfirmed
+        sort:
+          id:
+            asc: id ↓
+            desc: id ↑
+          created_at:
+            asc: created_at ↓
+            desc: created_at ↑
+          amount:
+            asc: amount ↓
+            desc: amount ↑
       buttons:
         submit: Submit
         clear_form: Clear Form
-      boolean:
-        'true': true
-        'false': false
-      sort:
-        id:
-          asc: id ↓
-          desc: id ↑
-        created_at:
-          asc: created_at ↓
-          desc: created_at ↑
-        amount:
-          asc: amount ↓
-          desc: amount ↑
 ```
 
 ## License

data/lib/sample_filter/action_view_extension.rb

@@ -91,23 +91,31 @@ module SampleFilter
       as = form.options[:as]
       from = filter_params_set.send(field).try(:[], :from)
       to = filter_params_set.send(field).try(:[], :to)
-      text_field_tag("#{as}[#{field}][from]", from, class: 'datepicker_input active') +
+      text_field_tag("#{as}[#{field}][from]", from, class: 'datepicker_input active', autocomplete: 'off') +
       content_tag(:div, ' - ', class: 'sample-filter__date-divider') +
-      text_field_tag("#{as}[#{field}][to]", to, class: 'datepicker_input')
+      text_field_tag("#{as}[#{field}][to]", to, class: 'datepicker_input', autocomplete: 'off')
     end
 
     def boolean_tag(form, prefix, filter_params_set, field)
-      form.select field, [[sft(:lists, :all_item), ''], [sft(prefix, :boolean, :true), 't'], [sft(prefix, :boolean, :false), 'f']]
+      form.select field, [[sft(prefix, :list, field, :all_item), ''], [sft(prefix, :list, field, :true), 't'], [sft(prefix, :list, field, :false), 'f']]
     end
 
     def list_tag(form, prefix, filter_params_set, field)
       values = filter_params_set.values_for(field)
-      form.select field, [[sft(:lists, :all_item), '']].concat(values.to_a)
+
+      translated_values =
+        if values.is_a?(Hash)
+          values.map{|el| [sft(prefix, :list, field, el[0]), el[1]]}
+        elsif values.is_a?(Array)
+          values.map{|el| [sft(prefix, :list, field, el), el]}
+        end
+
+      form.select field, [[sft(:lists, :all_item), '']].concat(translated_values)
     end
 
     def sorting_tag(form, prefix, filter_params_set, field)
       values = filter_params_set.values_for(field)
-      form.select(field, values.map{|v| [[sft(prefix, field, v, :asc), "#{v}_asc"], [sft(prefix, field, v, :desc), "#{v}_desc"]]}.flatten(1))
+      form.select(field, values.map{|v| [[sft(prefix, :list, field, v, :asc), "#{v}_asc"], [sft(prefix, :list, field, v, :desc), "#{v}_desc"]]}.flatten(1))
     end
 
     def action_buttons(prefix)

data/lib/sample_filter/version.rb

@@ -1,3 +1,3 @@
 module SampleFilter
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sample_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ilia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails