From f36b2ffbbc4393c402f65c389e65fdf3c9b77055 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Thu, 16 Feb 2017 20:12:13 -0800 Subject: [PATCH] Fixed issue with _all field in searchable [skip ci] --- CHANGELOG.md | 4 ++++ lib/searchkick/index_options.rb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37ce9f3..89d3ccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.1.2 [unreleased] + +- Fixed issue with `_all` field in `searchable` + ## 2.1.1 - Fixed duplicate notifications diff --git a/lib/searchkick/index_options.rb b/lib/searchkick/index_options.rb index ca18c61..5f4dfea 100644 --- a/lib/searchkick/index_options.rb +++ b/lib/searchkick/index_options.rb @@ -227,6 +227,8 @@ module Searchkick word = options[:word] != false && (!options[:match] || options[:match] == :word) + mapping_options[:searchable].delete("_all") + mapping_options.values.flatten.uniq.each do |field| fields = {} @@ -301,7 +303,7 @@ module Searchkick # http://www.elasticsearch.org/guide/reference/mapping/multi-field-type/ multi_field = dynamic_fields["{name}"].merge(fields: dynamic_fields.except("{name}")) - all_enabled = !options[:searchable] || options[:searchable].to_a.include?("_all") + all_enabled = !options[:searchable] || options[:searchable].to_a.map(&:to_s).include?("_all") mappings = { _default_: { -- libgit2 0.21.0