github / searchkick

Download as
Browse Code ยป

Commit 99affdaebdfd900f65d83e6a48e7691e6bb9c171

Authored by Andrew Kane
1 parent 0dd67e47
Exists in master and in 1 other branch allow_missing

Fixed context for index name for inherited models

Showing 2 changed files with 7 additions and 3 deletions   Show diff stats
CHANGELOG.md
  Diff comments   View file @99affda
  1 +## 5.0.3 (unreleased)
  2 +
  3 +- Fixed context for index name for inherited models
  4 +
1 5 ## 5.0.2 (2022-03-03)
2 6  
3 7 - Fixed index name for inherited models
... ...
lib/searchkick/model.rb
  Diff comments   View file @99affda
... ... @@ -66,7 +66,7 @@ module Searchkick
66 66 alias_method Searchkick.search_method_name, :searchkick_search if Searchkick.search_method_name
67 67  
68 68 def searchkick_index(name: nil)
69   - index_name = name || searchkick_index_name
  69 + index_name = name || searchkick_klass.searchkick_index_name
70 70 index_name = index_name.call if index_name.respond_to?(:call)
71 71 index_cache = class_variable_get(:@@searchkick_index_cache)
72 72 index_cache.fetch(index_name) { Searchkick::Index.new(index_name, searchkick_options) }
... ... @@ -88,9 +88,9 @@ module Searchkick
88 88 if options[:index_name]
89 89 options[:index_name]
90 90 elsif options[:index_prefix].respond_to?(:call)
91   - -> { [options[:index_prefix].call, searchkick_klass.model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") }
  91 + -> { [options[:index_prefix].call, model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") }
92 92 else
93   - [options.key?(:index_prefix) ? options[:index_prefix] : Searchkick.index_prefix, searchkick_klass.model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_")
  93 + [options.key?(:index_prefix) ? options[:index_prefix] : Searchkick.index_prefix, model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_")
94 94 end
95 95 end
96 96 end
... ...