query_report 1.0.7 → 1.0.8

data/app/views/query_report/_records.html.erb

@@ -2,7 +2,7 @@
     <table class="<%= QueryReport.config.record_table_class %>" cellpadding="0" cellspacing="0">
       <thead>
       <% report.columns.each do |column| %>
-          <th><%= column.sortable? ? sort_link(report.search, column.name, {}, remote: @remote) : column.humanize %></th>
+          <th><%= column.sortable? ? sort_link(report.search, column.name, params, remote: @remote) : column.humanize %></th>
       <% end %>
       </thead>
 

data/lib/query_report/filter.rb

@@ -16,6 +16,8 @@ module QueryReport
     # +options+:: Options can have the following,
     #             options[:type] => date | text | whatever
     #             options[:comp] => the comparators used for ransack search, [:gteq, :lteq]
+    #             options[:manual] => if set to true then that filter will not be applied, only will appear and can be used for custom application
+    #             options[:default] => support default filter value, can be one value or for range filter can be array
     def filter(column, options={}, &block)
       @filters ||= []
       @filters << Filter.new(@params, column, options, &block)
@@ -35,7 +37,7 @@ module QueryReport
       @filters.select(&:custom?).each do |filter|
         ordered_custom_param_values = ordered_param_value_objects(filter)
         has_no_user_input = ordered_custom_param_values.all? { |p| p.nil? or p == '' }
-        query = filter.block.call(query, *ordered_custom_param_values) unless has_no_user_input
+        query = filter.block.call(query, *ordered_custom_param_values) if filter.block and !has_no_user_input
       end
       query
     end
@@ -81,7 +83,7 @@ module QueryReport
       end
 
       def custom?
-        @block ? true : false
+        @block || @options[:manual] == true ? true : false
       end
 
       def search_keys

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails