Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Version bump 1.1.1. Respect the option's dataset value.

  • Loading branch information...
commit f178e988611edc3680db0be8482f678a0f761a6e 1 parent 0b7396c
Andrew Bennett authored
2  Gemfile.lock
View
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- mongoid-data_table (1.1.0)
+ mongoid-data_table (1.1.1)
kaminari (~> 0.12.4)
rails (>= 3.0.0)
2  lib/mongoid/data_table/proxy.rb
View
@@ -8,7 +8,7 @@ def initialize(klass, controller, options = {}, &block)
@klass = klass
@controller = controller
@options = klass.data_table_options.merge(options)
- @extension = block || klass.data_table_dataset || default_data_table_dataset
+ @extension = block || options[:dataset] || klass.data_table_dataset || default_data_table_dataset
@params = options[:params] || (controller.params.dup rescue {})
@criteria = options[:criteria] || klass.criteria
2  lib/mongoid/data_table/version.rb
View
@@ -1,5 +1,5 @@
module Mongoid
module DataTable
- VERSION = "1.1.0"
+ VERSION = "1.1.1"
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.