Commit c130e6c42beffcf33f9d9ef87224a3ae46283529
1 parent
795190bf
Exists in
master
and in
19 other branches
No more _default_ type
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
lib/searchkick/index_options.rb
| @@ -4,7 +4,7 @@ module Searchkick | @@ -4,7 +4,7 @@ module Searchkick | ||
| 4 | options = @options | 4 | options = @options |
| 5 | language = options[:language] | 5 | language = options[:language] |
| 6 | language = language.call if language.respond_to?(:call) | 6 | language = language.call if language.respond_to?(:call) |
| 7 | - type = options[:_type] || :_default_ | 7 | + type = options[:_type] |
| 8 | type = type.call if type.respond_to?(:call) | 8 | type = type.call if type.respond_to?(:call) |
| 9 | 9 | ||
| 10 | if options[:mappings] && !options[:merge_mappings] | 10 | if options[:mappings] && !options[:merge_mappings] |
lib/searchkick/model.rb
| @@ -12,7 +12,7 @@ module Searchkick | @@ -12,7 +12,7 @@ module Searchkick | ||
| 12 | 12 | ||
| 13 | Searchkick.models << self | 13 | Searchkick.models << self |
| 14 | 14 | ||
| 15 | - options[:_type] ||= -> { searchkick_index.klass_document_type(self, true) } if options[:inheritance] | 15 | + options[:_type] ||= -> { searchkick_index.klass_document_type(self, true) } |
| 16 | 16 | ||
| 17 | class_eval do | 17 | class_eval do |
| 18 | cattr_reader :searchkick_options, :searchkick_klass | 18 | cattr_reader :searchkick_options, :searchkick_klass |