simple_search_filter 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ffee1cbed77d5e698383324c0471649e9e95f8
-  data.tar.gz: 441e70da70aa6bb40ed856bd4d7be4e8f3b34ffa
+  metadata.gz: 321581e7e380ad2b76e093a1a9d362113cf36094
+  data.tar.gz: 3ca140a4b71b2cb3c0be869f3a39b13106aa5ba3
 SHA512:
-  metadata.gz: 7dad1abed96276bc2dcfb3cc9ab100b0cfeb0d2a46d87db0e3da24902e82e07e2f9f014a3257e6aa65791a889b438ba09709d68419e486b1ab7a87cc477a68c4
-  data.tar.gz: a3cb288103fe54ff259bc1e10a2a3d44d9cc82c398e5544af109f0c5d25a6594f42d42e7adce1b133ac147382fcfdcfdba0fadb98b6c66f83c6a456e3e6c5ddb
+  metadata.gz: a3d4add7f83c5a3bc4124739d18f15cb50f54f6f4e0ee2e8bdf6038a9be154432b959940f2f891586382db92c9365ac21b77f824a73648edcf6de0c6f9a0d2ab
+  data.tar.gz: 179e93f7895c97487c53e0e80c393b5e1f9d8ee7665830512593e48a61b2fef950851fef7540c519f684eee7fef60aa7951c7eeab3c1817a8ff61b4b1253e87b

data/lib/simple_search_filter/controller.rb

@@ -25,31 +25,34 @@ module SimpleSearchFilter
         @filter.clear_all
       end
 
-      # input from GET
-      @filter.fields.each do |name, f|
-        if params.has_key? name
-          @filter.set name, params[name]
+      # collect input
+      if cmd!='clear'
+        # input from GET
+        @filter.fields.each do |name, f|
+          if params.has_key? name
+            @filter.set name, params[name]
+          end
         end
-      end
 
+        # input from form
+        # post - save filter and redirect
+        #if request.post? && params[:filter]
+        if params[:filter] && cmd!='clear'
+          @filter.set_data_from_form params[:filter]
+          #(redirect_to url and return) if @filter.search_method_post_and_redirect?
+        else
+          # clean url => set page to 1
+          if @filter.search_method_post_and_redirect? && request.get? && cmd=='' && pg.nil?
+            @filter.page=1
+          elsif cmd=='back'
+            # do not touch filter - load it from session
+          end
 
-      # input from form
-      # post - save filter and redirect
-      #if request.post? && params[:filter]
-      if params[:filter]
-        @filter.set_data_from_form params[:filter]
-        #(redirect_to url and return) if @filter.search_method_post_and_redirect?
-      else
-        # clean url => set page to 1
-        if @filter.search_method_post_and_redirect? && request.get? && cmd=='' && pg.nil?
-          @filter.page=1
-        elsif cmd=='back'
-          # do not touch filter - load it from session
         end
 
-      end
+        @filter.data_save_to_session
 
-      @filter.data_save_to_session
+      end
 
 
       #

data/lib/simple_search_filter/filter.rb

@@ -220,7 +220,7 @@ module SimpleSearchFilter
     def clear_data
       data.clear
 
-      session_save 'data', @data
+      data_save_to_session
     end
 
     def set_data_from_form(params)

data/lib/simple_search_filter/version.rb

@@ -1,3 +1,3 @@
 module SimpleSearchFilter
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_search_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Max Ivak