Skip to content

Commit be5b44d

Browse files
committed
[MODEL] Call Kaminari::Hooks.init only when available
See: kaminari/kaminari@653143b Originally reported by @twe4ked in elastic#660. Closes elastic#660
1 parent 02a8407 commit be5b44d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

elasticsearch-model/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ In a Rails controller, use the the `params[:page]` parameter to paginate through
303303
To initialize and include the Kaminari pagination support manually:
304304

305305
```ruby
306-
Kaminari::Hooks.init
306+
Kaminari::Hooks.init if defined?(Kaminari::Hooks)
307307
Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
308308
```
309309

elasticsearch-model/examples/activerecord_article.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
end
2727
end
2828

29-
Kaminari::Hooks.init
29+
Kaminari::Hooks.init if defined?(Kaminari::Hooks) if defined?(Kaminari::Hooks)
3030

3131
class Article < ActiveRecord::Base
3232
end

elasticsearch-model/test/integration/active_record_pagination_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ::ArticleForPagination < ActiveRecord::Base
3030
end
3131
end
3232

33-
Kaminari::Hooks.init
33+
Kaminari::Hooks.init if defined?(Kaminari::Hooks)
3434

3535
ArticleForPagination.delete_all
3636
ArticleForPagination.__elasticsearch__.create_index! force: true

0 commit comments

Comments
 (0)