Merge pull request #33 from josegonzalez/master

Updated paginate Helper for usage in Rails 3
tj · Jul 21, 2011 · a9d4225 · a9d4225
2 parents 1eadaa3 + bfca04e
commit a9d4225
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/dm-pager/helpers/rails.rb b/lib/dm-pager/helpers/rails.rb
@@ -10,7 +10,7 @@ module DataMapper::Pagination::Helpers::Rails
   #   :size    Number of intermediate page number links to be shown; Defaults to 7
 
   def paginate collection, options = {}
-    uri = @template.url_for @template.params.merge(options[:params] || {})
+    uri = options[:uri] || controller.url_for(controller.params.merge(options[:params] || {}))
     collection.pager.to_html uri, options
   end