mighty_grid 2.1.0 → 2.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/mighty_grid/base.rb +4 -2
- data/lib/mighty_grid/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3e84584628a8a448ee8e2413b07f275639e76360
|
|
4
|
+
data.tar.gz: 69e10705c9d0177c730cdb74e5d0174440e33d6b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4f9f08d32b9c5c134bd94168e5c6d1d2d90851c103a42499bd91241dece9eb856d77f752481e92eaea54a26d45881fb30e9929fcd04061f7a594511a7f94e299
|
|
7
|
+
data.tar.gz: e1471b2ab929ee5dc0068306c5e3acafc3ea3cd8812c9b7e1135a834459145e0df4b9f1fad49d56629778a6ba35a5fdaa630862d21746288ec9fef553e45da24
|
data/lib/mighty_grid/base.rb
CHANGED
|
@@ -66,8 +66,7 @@ module MightyGrid
|
|
|
66
66
|
|
|
67
67
|
def read
|
|
68
68
|
search_apply_filter if @use_sphinx
|
|
69
|
-
|
|
70
|
-
if @use_sphinx && @query
|
|
69
|
+
if @use_sphinx && @query.present?
|
|
71
70
|
ts_apply_filters
|
|
72
71
|
if @mg_params[:order].present? && current_order_direction.present? && !@mg_params[:order].kind_of?(Hash)
|
|
73
72
|
@sphinx_options.merge!(order: "#{@mg_params[:order]} #{current_order_direction.to_sym}")
|
|
@@ -76,6 +75,9 @@ module MightyGrid
|
|
|
76
75
|
end
|
|
77
76
|
|
|
78
77
|
@relation = @klass.search(ThinkingSphinx::Query.escape(@query), @sphinx_options)
|
|
78
|
+
@relation = @relation
|
|
79
|
+
.page(@mg_params[:page])
|
|
80
|
+
.per(@mg_params[:per_page])
|
|
79
81
|
else
|
|
80
82
|
ar_apply_filters
|
|
81
83
|
if @mg_params[:order].present? && current_order_direction.present? && !@mg_params[:order].kind_of?(Hash)
|
data/lib/mighty_grid/version.rb
CHANGED