simple_search_filter 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc2f48c92033891cfede39dfe2cd512b1c475e18
-  data.tar.gz: f84edba0246e40e4a483e560c72db713d09249bd
+  metadata.gz: 3277b8c1adc9f68e8abe6a55f237f1d451106d12
+  data.tar.gz: f1544b89554e0e9330db0e2b93e495d1da02b9f3
 SHA512:
-  metadata.gz: ce9085bd199a52f8a8dfffeb120541334fbf82767c1ddbee7d719e35d6b41ac2b89b7464e41ec0b9f75a16582a997a642e336e4550a445925872829fab1c9464
-  data.tar.gz: d62aec7c5bce7d76c37282df7207feaf1da0522323024096175e3274ba0927e5809cd7adf2a71717842950fd176a671b5209730255e4c2399db11ee92060ecb8
+  metadata.gz: 2c43d81670f6dbbabf612349593755c76e70bb2d9942e3cf98d1bdeef8f1cafd0d80418cebc69a0f081f04c898848e5e577359f7779a94ecc5605b9fd2c81741
+  data.tar.gz: 669e7b582d9684f6152468ebd5b3fb95e7397e0ab53b50a29a4359cc8d69f20f92958fc0535ab2ce2184b2f993f1b95ccbcfbcf490cd4b6dadbbc44ea09ea4b8

data/lib/simple_search_filter/filter.rb

@@ -342,14 +342,43 @@ module SimpleSearchFilter
     end
 
 
-    def get_opposite_order_dir_for_column(name)
+    # return nil if not sorted by this column
+    # return order dir if sorted by this column
+    def get_order_dir_for_column(name)
       name = name.to_s
+      current_column = get_order_column
+
+      return nil unless current_column==name
+
+      dir = get_order_dir
+      return nil if dir.nil?
+
+      dir
+    end
+
+    def get_order_column
+      ord = order
+      return nil if ord.empty?
+
+      ord[0][0].to_s
+    end
 
+    def get_order_dir
       ord = order
-      return 'asc' if ord.empty?
+      return nil if ord.empty?
 
-      if ord[0][0].to_s == name
-        return opposite_order_dir(ord[0][1])
+      ord[0][1].to_s
+    end
+
+
+    def get_opposite_order_dir_for_column(name)
+      name = name.to_s
+
+      ord_column = get_order_column
+      return 'asc' if ord_column.nil?
+
+      if ord_column == name
+        return opposite_order_dir(order[0][1])
       end
 
       return 'asc'
@@ -364,6 +393,8 @@ module SimpleSearchFilter
 
 
 
+
+
     def url_params_for_sortable_column(name)
       p = {}
       p[CMD_PARAM_NAME] = CMD_ORDER

data/lib/simple_search_filter/helpers/form_helper.rb

@@ -57,7 +57,18 @@ module SimpleSearchFilter
         #html_options[:method] = @filter.form_method
         url = send(@filter.url, @filter.url_params_for_sortable_column(field_name))
 
-        link_to(title, url, html_options)
+        opt_show_arrows = html_options[:show_arrows].presence || SimpleSearchFilter.sortable_column_show_arrows
+        order_dir = @filter.get_order_dir_for_column(field_name) if opt_show_arrows
+
+        if !opt_show_arrows || order_dir.nil?
+          link_to(title, url, html_options)
+        else
+          # with arrows
+          link_to(url, html_options) do
+            (title+' <i class="fa fa-sort-'+order_dir+'"></i>').html_safe
+          end
+        end
+
       end
 
 

data/lib/simple_search_filter/version.rb

@@ -1,3 +1,3 @@
 module SimpleSearchFilter
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
 end

data/lib/simple_search_filter.rb

@@ -1,10 +1,18 @@
 module SimpleSearchFilter
   mattr_accessor :page_default_param_name
 
-  def page_default_param_name
+  def self.page_default_param_name
     (@@page_default_param_name || :page).to_sym
   end
 
+  mattr_accessor :sortable_column_show_arrows
+
+  def self.sortable_column_show_arrows
+    v = @@sortable_column_show_arrows
+    v = true if v.nil?
+    v
+  end
+
 end
 
 

data/test/dummy/app/assets/stylesheets/application.css.scss

@@ -14,5 +14,10 @@
  *= require_self
  */
 
+
+@import "compass/css3";
+
+@import "font-awesome";
+
 @import "bootstrap-sprockets";
 @import "bootstrap";

data/test/dummy/app/views/products/index.html.haml

@@ -19,4 +19,5 @@ Filter:
 
 = paginate @items
 %br
-Found: #{@items.total_count}
+Found: #{@items.total_count}
+

data/test/dummy/config/initializers/simple_search_filter.rb

@@ -1 +1,3 @@
 SimpleSearchFilter.page_default_param_name = :pg
+#SimpleSearchFilter.sortable_column_show_arrows = true
+