Model controller - don't set :order => :default if there is already a…

…n ordering
tslocke · Jul 7, 2008 · 3ad35f3 · 3ad35f3 · magicseth · Jul 13, 2008
1 parent d1a4bb7
commit 3ad35f3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/hobo/lib/hobo/model_controller.rb b/hobo/lib/hobo/model_controller.rb
@@ -359,9 +359,11 @@ def request_requires_pagination?
     def find_or_paginate(finder, options)
       options = options.reverse_merge(:paginate => request_requires_pagination?)
       do_pagination = options.delete(:paginate) && finder.respond_to?(:paginate)
+      options[:order] = :default unless options[:order] || finder.send(:scope, :find)[:order]
 
       if do_pagination
-        finder.paginate(options.reverse_merge(:page => params[:page] || 1, :order => :default))
+        options.reverse_merge!(:page => params[:page] || 1)
+        finder.paginate(options)
       else
         finder.all(options)
       end