simple_search_filter 0.0.25 → 0.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/simple_search_filter/controller.rb +22 -19
- data/lib/simple_search_filter/filter.rb +1 -1
- data/lib/simple_search_filter/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: 321581e7e380ad2b76e093a1a9d362113cf36094
|
|
4
|
+
data.tar.gz: 3ca140a4b71b2cb3c0be869f3a39b13106aa5ba3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a3d4add7f83c5a3bc4124739d18f15cb50f54f6f4e0ee2e8bdf6038a9be154432b959940f2f891586382db92c9365ac21b77f824a73648edcf6de0c6f9a0d2ab
|
|
7
|
+
data.tar.gz: 179e93f7895c97487c53e0e80c393b5e1f9d8ee7665830512593e48a61b2fef950851fef7540c519f684eee7fef60aa7951c7eeab3c1817a8ff61b4b1253e87b
|
|
@@ -25,31 +25,34 @@ module SimpleSearchFilter
|
|
|
25
25
|
@filter.clear_all
|
|
26
26
|
end
|
|
27
27
|
|
|
28
|
-
# input
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
# collect input
|
|
29
|
+
if cmd!='clear'
|
|
30
|
+
# input from GET
|
|
31
|
+
@filter.fields.each do |name, f|
|
|
32
|
+
if params.has_key? name
|
|
33
|
+
@filter.set name, params[name]
|
|
34
|
+
end
|
|
32
35
|
end
|
|
33
|
-
end
|
|
34
36
|
|
|
37
|
+
# input from form
|
|
38
|
+
# post - save filter and redirect
|
|
39
|
+
#if request.post? && params[:filter]
|
|
40
|
+
if params[:filter] && cmd!='clear'
|
|
41
|
+
@filter.set_data_from_form params[:filter]
|
|
42
|
+
#(redirect_to url and return) if @filter.search_method_post_and_redirect?
|
|
43
|
+
else
|
|
44
|
+
# clean url => set page to 1
|
|
45
|
+
if @filter.search_method_post_and_redirect? && request.get? && cmd=='' && pg.nil?
|
|
46
|
+
@filter.page=1
|
|
47
|
+
elsif cmd=='back'
|
|
48
|
+
# do not touch filter - load it from session
|
|
49
|
+
end
|
|
35
50
|
|
|
36
|
-
# input from form
|
|
37
|
-
# post - save filter and redirect
|
|
38
|
-
#if request.post? && params[:filter]
|
|
39
|
-
if params[:filter]
|
|
40
|
-
@filter.set_data_from_form params[:filter]
|
|
41
|
-
#(redirect_to url and return) if @filter.search_method_post_and_redirect?
|
|
42
|
-
else
|
|
43
|
-
# clean url => set page to 1
|
|
44
|
-
if @filter.search_method_post_and_redirect? && request.get? && cmd=='' && pg.nil?
|
|
45
|
-
@filter.page=1
|
|
46
|
-
elsif cmd=='back'
|
|
47
|
-
# do not touch filter - load it from session
|
|
48
51
|
end
|
|
49
52
|
|
|
50
|
-
|
|
53
|
+
@filter.data_save_to_session
|
|
51
54
|
|
|
52
|
-
|
|
55
|
+
end
|
|
53
56
|
|
|
54
57
|
|
|
55
58
|
#
|