From 6136f0f9ed146d1278ac74a18fddfdbf3d9defae Mon Sep 17 00:00:00 2001 From: Matt Jones Date: Sun, 17 Jan 2010 23:17:29 -0500 Subject: [PATCH] accept :scope option on hobo_index and hobo_index_for --- hobo/lib/hobo/model_controller.rb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hobo/lib/hobo/model_controller.rb b/hobo/lib/hobo/model_controller.rb index 2d5c6b4..e0fb4fc 100644 --- a/hobo/lib/hobo/model_controller.rb +++ b/hobo/lib/hobo/model_controller.rb @@ -449,6 +449,8 @@ module Hobo def find_or_paginate(finder, options) options = options.reverse_merge(:paginate => request_requires_pagination?) do_pagination = options.delete(:paginate) && finder.respond_to?(:paginate) + finder = Array.wrap(options.delete(:scope)).inject(finder) { |a, v| a.send(*Array.wrap(v).flatten) } + options[:order] = :default unless options[:order] || finder.send(:scope, :find)._?[:order] if do_pagination -- 1.5.3.1