wice_grid_mongoid 6.0.4 → 6.0.5

data/VERSION

@@ -1 +1 @@
-6.0.4
+6.0.5

data/lib/helpers/wice_grid_view_helpers.rb

@@ -750,7 +750,7 @@ module Wice
 
     def pagination_info(grid, allow_showing_all_records)  #:nodoc:
       found = grid.resultset.count
-      total = grid.klass.count
+      total = grid.extra_filter.count
       shown = [found, grid.status[:per_page].to_i].min
       summary = ""
       summary << "Shown: #{shown}"

data/lib/wice_grid.rb

@@ -45,7 +45,7 @@ module Wice
   class WiceGrid
 
     attr_reader :klass, :name, :resultset, :custom_order, :query_store_model, :options, :controller
-    attr_reader :ar_options, :status, :export_to_csv_enabled, :csv_file_name, :saved_query
+    attr_reader :ar_options, :status, :export_to_csv_enabled, :csv_file_name, :saved_query, :extra_filter
     attr_writer :renderer
     attr_accessor :output_buffer, :view_helper_finished, :csv_tempfile
 
@@ -134,6 +134,11 @@ module Wice
       @criteria_formed = false
     end
 
+    def add_criteria(extra)
+      @extra_filter = extra
+      @criteria.merge(extra)
+    end
+    
     def has_any_filter_criteria?
       @has_any_filter_criteria
     end

data/wice_grid_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wice_grid_mongoid}
-  s.version = "6.0.4"
+  s.version = "6.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind", "Aleksandr Furmanov"]
-  s.date = %q{2010-11-30}
+  s.date = %q{2010-12-10}
   s.description = %q{A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters }
   s.email = %q{aleksandr.furmanov@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wice_grid_mongoid
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 6
   - 0
-  - 4
-  version: 6.0.4
+  - 5
+  version: 6.0.5
 platform: ruby
 authors: 
 - Yuri Leikind
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -08:00
+date: 2010-12-10 00:00:00 -08:00
 default_executable: 
 dependencies: []