simple_search_filter 0.0.17 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d97694ac124a4f428f920eedfe1a60b5e7ff5e2
-  data.tar.gz: 1824518b3ffe6862ea86dcc805ea0bcf4e74d760
+  metadata.gz: 90fb37f33f49e300b74e6d8ef2815d0737901557
+  data.tar.gz: 0e92936938079263d7b260f2b4cd852a2615170a
 SHA512:
-  metadata.gz: 5b85a33602c91046b4b614fb217d2f27c9728558b8aae0bb36d4bd05a1e04beb0d3d305e9ea6b1ec04035a77fa60acff03c404a243a08cec5862f3fcb8e0dd29
-  data.tar.gz: 0d8d6bddc31d61583ba4e85beec3f89073661f76ae133537d2713ad442d3889076074407d875a28d2f01bc0212efbf7fca3b129702faf8216703bbd521bc7c91
+  metadata.gz: d51bb419a75b0b8b10e5478949a5e8df02d820a55e824b73348b59b668ee20db466808734f00bb8bd7b6bb6f1ebb34fd9e8ff4808d6af0af5ef08a68ceb38bc2
+  data.tar.gz: fe8dcac3e425cbeb507aacdd8a859c1da6d8551c955e26d5bb7a395290eb43a13bdd808998468a207e0304b06a2976b4380b853e5eb170206ab4b64faf486f15

data/lib/simple_search_filter/controller.rb

@@ -31,12 +31,23 @@ module SimpleSearchFilter
       #if request.post? && params[:filter]
       if params[:filter]
         if cmd=='clear'
-          @filter.clear_data
+          @filter.clear_all
         else
+          if cmd=='apply' || cmd=='set'
+            @filter.clear_all
+          end
+
+          #
           @filter.set_data_from_form params[:filter]
         end
 
         #(redirect_to url and return) if @filter.search_method_post_and_redirect?
+      else
+        # clean url => set page to 1
+        if request.get? && cmd=='' && pg.nil?
+          @filter.page=1
+        end
+
       end
 
       if cmd=='order'
@@ -44,8 +55,6 @@ module SimpleSearchFilter
         (redirect_to action: name.to_sym and return) if @filter.search_method_post_and_redirect?
       end
 
-
-
     end
 
     module ClassMethods

data/lib/simple_search_filter/filter.rb

@@ -212,6 +212,11 @@ module SimpleSearchFilter
     end
 
 
+    def clear_all
+      self.page=1
+      clear_order
+      clear_data
+    end
 
     def clear_data
       data.clear
@@ -311,6 +316,9 @@ module SimpleSearchFilter
     end
 
     def set_default_order(order_by, order_dir)
+      @order_default = [[order_by, order_dir]]
+
+      #
       return false if !order.nil? && !order.empty?
 
       set_order(order_by, order_dir)
@@ -327,6 +335,10 @@ module SimpleSearchFilter
       order[0]
     end
 
+    def clear_order
+      self.order = @order_default
+    end
+
 
     def get_opposite_order_dir_for_column(name)
       name = name.to_s

data/lib/simple_search_filter/version.rb

@@ -1,3 +1,3 @@
 module SimpleSearchFilter
-  VERSION = "0.0.17"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_search_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.20
 platform: ruby
 authors:
 - Max Ivak
@@ -618,7 +618,6 @@ files:
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/znLi_g--cOzgCoKAqtlFPUgWJ9unCsXnEvjrFOVsgt8.cache
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/zvGwr55LmRTcpn_qmLf9EFICIXWA4cfH_4nBFi_cfj0.cache
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/zxS8Tu3AwLjiFU0cs3pGX-IWrHVCoQBBBbliUPrWe3E.cache
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/categories.yml
 - test/fixtures/products.yml
 - test/integration/navigation_test.rb
@@ -1188,7 +1187,6 @@ test_files:
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/_HqBvRhZwKsB7cuKZoO5r5Ut4SP3y_90m8vbU9guYps.cache
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/_uTxqC5iwzUGjNZWJUFnxL8-jngVDQtxfl76-1rSO-E.cache
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/_ZjZ4vRiEy4hUT4dUNx8lMAsZTs_Cqvrb045k4O8sgM.cache
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/categories.yml
 - test/fixtures/products.yml
 - test/integration/navigation_test.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-16412